summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO26
-rw-r--r--PKGBUILD16
-rw-r--r--config.i68610
-rw-r--r--config.x86_6410
-rw-r--r--unfuck_bfq.patch14
5 files changed, 47 insertions, 29 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 796ea726e18a..1197a5eeadb2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Mon Oct 16 20:59:35 UTC 2017
+# Sun Oct 22 12:39:27 UTC 2017
pkgbase = linux-ck
- pkgver = 4.13.7
- pkgrel = 2
+ pkgver = 4.13.9
+ pkgrel = 1
url = https://wiki.archlinux.org/index.php/Linux-ck
arch = i686
arch = x86_64
@@ -14,24 +14,24 @@ pkgbase = linux-ck
options = !strip
source = http://www.kernel.org/pub/linux/kernel/v4.x/linux-4.13.tar.xz
source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.13.tar.sign
- source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.13.7.xz
- source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.13.7.sign
+ source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.13.9.xz
+ source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.13.9.sign
source = http://ck.kolivas.org/patches/4.0/4.13/4.13-ck1/patch-4.13-ck1.xz
- source = http://ck.kolivas.org/patches/4.0/4.13/4.13-ck1/patches/0015-Enable-and-make-BFQ-default-IO-scheduler-overriding-.patch
source = enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v4.13+.patch::https://raw.githubusercontent.com/graysky2/kernel_gcc_patch/master/enable_additional_cpu_optimizations_for_gcc_v4.9%2B_kernel_v4.13%2B.patch
+ source = unfuck_bfq.patch
source = config.i686
source = config.x86_64
source = 90-linux.hook
source = linux.preset
sha256sums = 2db3d6066c3ad93eb25b973a3d2951e022a7e975ee2fa7cbe5bddf84d9a49a2c
sha256sums = SKIP
- sha256sums = 0fe89c96e956efbded576214eef0c8e43cabe41dfca245e3ebb79fff9bc8715d
+ sha256sums = 22156e82467c7911d226a0a887eba19103434efc104439a3b426a3fa551fb8f2
sha256sums = SKIP
sha256sums = a44bf7af8cec88aeb1159ecb4a0395bc214eb98fe6c0c398d38475e63b280fe8
- sha256sums = e25c4b7be8568534e7ae9cfc6986fab262f4b8943a3f13155c2a2a17386a52fb
sha256sums = 8b00041911e67654b0bd9602125853a1a94f6155c5cac4f886507554c8324ee8
- sha256sums = 7dbdf4c4c0c56a5e4cf1d08b9e15a1b016337c1e4f46d7424a6c30a8967a177e
- sha256sums = a5628995dfa6c94ff3ea19cd72ffb141b67bd4d8a962e8e79d0641cdf77dce51
+ sha256sums = 5be21ae06708fb33021a536078cdbfcfe3f73e466694d28ba9e729ebfc575ed0
+ sha256sums = 762765be3d1b616bb0a33e8ce2d9a7661af5c1e8f4a56714a640268d3003eb68
+ sha256sums = 96c3639d9d193405f3e0db0c0be9f66dd9f01cfd24fde712572b9e31b29495d7
sha256sums = 834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0
sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65
@@ -43,12 +43,12 @@ pkgname = linux-ck
depends = kmod
depends = mkinitcpio>=0.7
optdepends = crda: to set the correct wireless channels of your country
- provides = linux-ck=4.13.7
+ provides = linux-ck=4.13.9
backup = etc/mkinitcpio.d/linux-ck.preset
pkgname = linux-ck-headers
pkgdesc = Header files and scripts for building modules for Linux-ck kernel
depends = linux-ck
- provides = linux-ck-headers=4.13.7
- provides = linux-headers=4.13.7
+ provides = linux-ck-headers=4.13.9
+ provides = linux-headers=4.13.9
diff --git a/PKGBUILD b/PKGBUILD
index e68582237708..aada3b4dd1c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -39,8 +39,8 @@ _use_current=
pkgbase=linux-ck
_srcname=linux-4.13
-pkgver=4.13.7
-pkgrel=2
+pkgver=4.13.9
+pkgrel=1
_ckpatchversion=1
arch=('i686' 'x86_64')
url="https://wiki.archlinux.org/index.php/Linux-ck"
@@ -54,8 +54,8 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
"https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz"
"https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.sign"
"http://ck.kolivas.org/patches/4.0/4.13/4.13-ck${_ckpatchversion}/${_ckpatchname}.xz"
- "http://ck.kolivas.org/patches/4.0/4.13/4.13-ck1/patches/0015-Enable-and-make-BFQ-default-IO-scheduler-overriding-.patch"
"$_gcc_patch::https://raw.githubusercontent.com/graysky2/kernel_gcc_patch/master/enable_additional_cpu_optimizations_for_gcc_v4.9%2B_kernel_v4.13%2B.patch"
+ 'unfuck_bfq.patch'
# the main kernel config files
'config.i686' 'config.x86_64'
# pacman hook for initramfs regeneration
@@ -64,13 +64,13 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
'linux.preset')
sha256sums=('2db3d6066c3ad93eb25b973a3d2951e022a7e975ee2fa7cbe5bddf84d9a49a2c'
'SKIP'
- '0fe89c96e956efbded576214eef0c8e43cabe41dfca245e3ebb79fff9bc8715d'
+ '22156e82467c7911d226a0a887eba19103434efc104439a3b426a3fa551fb8f2'
'SKIP'
'a44bf7af8cec88aeb1159ecb4a0395bc214eb98fe6c0c398d38475e63b280fe8'
- 'e25c4b7be8568534e7ae9cfc6986fab262f4b8943a3f13155c2a2a17386a52fb'
'8b00041911e67654b0bd9602125853a1a94f6155c5cac4f886507554c8324ee8'
- '7dbdf4c4c0c56a5e4cf1d08b9e15a1b016337c1e4f46d7424a6c30a8967a177e'
- 'a5628995dfa6c94ff3ea19cd72ffb141b67bd4d8a962e8e79d0641cdf77dce51'
+ '5be21ae06708fb33021a536078cdbfcfe3f73e466694d28ba9e729ebfc575ed0'
+ '762765be3d1b616bb0a33e8ce2d9a7661af5c1e8f4a56714a640268d3003eb68'
+ '96c3639d9d193405f3e0db0c0be9f66dd9f01cfd24fde712572b9e31b29495d7'
'834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0'
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65')
validpgpkeys=(
@@ -91,7 +91,7 @@ prepare() {
# Patch source with ck patchset
patch -Np1 -i "../${_ckpatchname}"
- patch -Np1 -R -i "../0015-Enable-and-make-BFQ-default-IO-scheduler-overriding-.patch"
+ patch -Np1 -i "../unfuck_bfq.patch"
# Patch source to unlock additional gcc CPU optimizatons
# https://github.com/graysky2/kernel_gcc_patch
diff --git a/config.i686 b/config.i686
index bab3b2ed9523..484584c58c75 100644
--- a/config.i686
+++ b/config.i686
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.13.7-2 Kernel Configuration
+# Linux/x86 4.13.9-1 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -387,9 +387,11 @@ CONFIG_IOSCHED_DEADLINE=y
CONFIG_IOSCHED_CFQ=y
CONFIG_CFQ_GROUP_IOSCHED=y
# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
+CONFIG_DEFAULT_BFQ=y
+# CONFIG_DEFAULT_CFQ_NOINHERIT is not set
+# CONFIG_DEFAULT_KYBER is not set
# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_DEFAULT_IOSCHED="bfq"
CONFIG_MQ_IOSCHED_DEADLINE=y
CONFIG_MQ_IOSCHED_KYBER=y
CONFIG_IOSCHED_BFQ=y
@@ -2189,7 +2191,7 @@ CONFIG_RAID_ATTRS=m
CONFIG_SCSI=m
CONFIG_SCSI_DMA=y
CONFIG_SCSI_NETLINK=y
-# CONFIG_SCSI_MQ_DEFAULT is not set
+CONFIG_SCSI_MQ_DEFAULT=y
CONFIG_SCSI_PROC_FS=y
#
diff --git a/config.x86_64 b/config.x86_64
index 255df14da2ba..296cd2e7108f 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.13.7-2 Kernel Configuration
+# Linux/x86 4.13.9-1 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -406,9 +406,11 @@ CONFIG_IOSCHED_DEADLINE=y
CONFIG_IOSCHED_CFQ=y
CONFIG_CFQ_GROUP_IOSCHED=y
# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
+CONFIG_DEFAULT_BFQ=y
+# CONFIG_DEFAULT_CFQ_NOINHERIT is not set
+# CONFIG_DEFAULT_KYBER is not set
# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_DEFAULT_IOSCHED="bfq"
CONFIG_MQ_IOSCHED_DEADLINE=y
CONFIG_MQ_IOSCHED_KYBER=y
CONFIG_IOSCHED_BFQ=y
@@ -2181,7 +2183,7 @@ CONFIG_RAID_ATTRS=m
CONFIG_SCSI=m
CONFIG_SCSI_DMA=y
CONFIG_SCSI_NETLINK=y
-# CONFIG_SCSI_MQ_DEFAULT is not set
+CONFIG_SCSI_MQ_DEFAULT=y
CONFIG_SCSI_PROC_FS=y
#
diff --git a/unfuck_bfq.patch b/unfuck_bfq.patch
new file mode 100644
index 000000000000..ce0d1cd59c36
--- /dev/null
+++ b/unfuck_bfq.patch
@@ -0,0 +1,14 @@
+--- a/block/elevator.c 2017-09-03 16:56:17.000000000 -0400
++++ b/block/elevator.c 2017-10-22 08:11:01.216178752 -0400
+@@ -229,7 +229,11 @@ int elevator_init(struct request_queue *
+ */
+ if (q->mq_ops) {
+ if (q->nr_hw_queues == 1)
++ #if defined(CONFIG_ZEN_INTERACTIVE) && defined(CONFIG_IOSCHED_BFQ)
++ e = elevator_get("bfq", false);
++ #else
+ e = elevator_get("mq-deadline", false);
++ #endif
+ if (!e)
+ return 0;
+ } else