diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | unfuck_bfq.patch | 14 | ||||
| -rw-r--r-- | unfuck_bfq_v2.patch | 14 |
4 files changed, 22 insertions, 22 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Mon Oct 30 22:40:56 UTC 2017 +# Mon Oct 30 23:33:15 UTC 2017 pkgbase = linux-ck pkgver = 4.13.10 - pkgrel = 2 + pkgrel = 3 url = https://wiki.archlinux.org/index.php/Linux-ck arch = i686 arch = x86_64 @@ -18,7 +18,7 @@ pkgbase = linux-ck source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.13.10.sign source = http://ck.kolivas.org/patches/4.0/4.13/4.13-ck1/patch-4.13-ck1.xz 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 = unfuck_bfq_v2.patch 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 = config.i686 source = config.x86_64 @@ -30,7 +30,7 @@ pkgbase = linux-ck sha256sums = SKIP sha256sums = a44bf7af8cec88aeb1159ecb4a0395bc214eb98fe6c0c398d38475e63b280fe8 sha256sums = 8b00041911e67654b0bd9602125853a1a94f6155c5cac4f886507554c8324ee8 - sha256sums = 5be21ae06708fb33021a536078cdbfcfe3f73e466694d28ba9e729ebfc575ed0 + sha256sums = 8b8c0c1cef459d629fd416aa970c00844a56b67625e128444792dc672430cbdc sha256sums = e25c4b7be8568534e7ae9cfc6986fab262f4b8943a3f13155c2a2a17386a52fb sha256sums = 10c09ca210f0a44fcfde9d8159be79f8c22e6b1a0da5c84eb32e51deb1e4a707 sha256sums = 32b040b5a98a01139d4d62fae26ae222f33c45fe9667e072e1e753aac72c8643 @@ -40,7 +40,7 @@ _use_current= pkgbase=linux-ck _srcname=linux-4.13 pkgver=4.13.10 -pkgrel=2 +pkgrel=3 _ckpatchversion=1 arch=('i686' 'x86_64') url="https://wiki.archlinux.org/index.php/Linux-ck" @@ -55,7 +55,7 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.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" "$_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' + 'unfuck_bfq_v2.patch' "http://ck.kolivas.org/patches/4.0/4.13/4.13-ck1/patches/0015-Enable-and-make-BFQ-default-IO-scheduler-overriding-.patch" # the main kernel config files 'config.i686' 'config.x86_64' @@ -69,7 +69,7 @@ sha256sums=('2db3d6066c3ad93eb25b973a3d2951e022a7e975ee2fa7cbe5bddf84d9a49a2c' 'SKIP' 'a44bf7af8cec88aeb1159ecb4a0395bc214eb98fe6c0c398d38475e63b280fe8' '8b00041911e67654b0bd9602125853a1a94f6155c5cac4f886507554c8324ee8' - '5be21ae06708fb33021a536078cdbfcfe3f73e466694d28ba9e729ebfc575ed0' + '8b8c0c1cef459d629fd416aa970c00844a56b67625e128444792dc672430cbdc' 'e25c4b7be8568534e7ae9cfc6986fab262f4b8943a3f13155c2a2a17386a52fb' '10c09ca210f0a44fcfde9d8159be79f8c22e6b1a0da5c84eb32e51deb1e4a707' '32b040b5a98a01139d4d62fae26ae222f33c45fe9667e072e1e753aac72c8643' @@ -94,7 +94,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 -Np1 -i "../unfuck_bfq_v2.patch" # Patch source to unlock additional gcc CPU optimizatons # https://github.com/graysky2/kernel_gcc_patch diff --git a/unfuck_bfq.patch b/unfuck_bfq.patch deleted file mode 100644 index ce0d1cd59c36..000000000000 --- a/unfuck_bfq.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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 diff --git a/unfuck_bfq_v2.patch b/unfuck_bfq_v2.patch new file mode 100644 index 000000000000..6a413365da94 --- /dev/null +++ b/unfuck_bfq_v2.patch @@ -0,0 +1,14 @@ +diff --git a/block/elevator.c b/block/elevator.c +index 4bb2f0c93fa6..b7a257d14c4a 100644 +--- a/block/elevator.c ++++ b/block/elevator.c +@@ -228,8 +228,7 @@ int elevator_init(struct request_queue *q, char *name) + * to "none". + */ + if (q->mq_ops) { +- if (q->nr_hw_queues == 1) +- e = elevator_get("mq-deadline", false); ++ e = elevator_get("bfq", false); + if (!e) + return 0; + } else |