summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD12
-rw-r--r--bfs-009-add-preempt_offset-argument-to-should_resched.patch37
3 files changed, 55 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 039215f2b7bd..af72d224d7e9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = linux-ck
- pkgver = 4.1.11
+ pkgver = 4.1.12
pkgrel = 1
url = https://wiki.archlinux.org/index.php/Linux-ck
arch = i686
@@ -11,26 +11,28 @@ pkgbase = linux-ck
options = !strip
source = http://www.kernel.org/pub/linux/kernel/v4.x/linux-4.1.tar.xz
source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.1.tar.sign
- source = http://www.kernel.org/pub/linux/kernel/v4.x/patch-4.1.11.xz
- source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.1.11.sign
+ source = http://www.kernel.org/pub/linux/kernel/v4.x/patch-4.1.12.xz
+ source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.1.12.sign
source = config.x86_64
source = config
source = linux-ck.preset
source = change-default-console-loglevel.patch
source = http://ck.kolivas.org/patches/4.0/4.1/4.1-ck2/patch-4.1-ck2.bz2
+ source = bfs-009-add-preempt_offset-argument-to-should_resched.patch
source = http://repo-ck.com/source/gcc_patch/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch.gz
source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.1.0-v7r8/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r8-4.1.patch
source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.1.0-v7r8/0002-block-introduce-the-BFQ-v7r8-I-O-sched-for-4.1.patch
source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.1.0-v7r8/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r8-for-4.1.0.patch
sha256sums = caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f
sha256sums = SKIP
- sha256sums = f98156dd7ceac2849de16b38cdb7a530cd3c74833ab613e0822b7bc4583cccb1
+ sha256sums = f3520b06e6a2b9929173c680de75f11cde9f0a380e04195d538b5de820a549ae
sha256sums = SKIP
sha256sums = b04ce2128ddb94be5ffafb4383d5c8b016760500696b1426a6e552c9a61ab27c
sha256sums = cc181fe0cfcedcd3bf606d7cce53e07dfb206d6c3549238dc7f4d0d27973d1a4
sha256sums = 2b3ebf5446aa3cac279842ca00bc1f2d6b7ff1766915282c201d763dbf6ca07e
sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99
sha256sums = 87726411f583862e456156fe82ef51b188e5d92e7a4bd944e01a091cd7c46428
+ sha256sums = 0c8d94a0c416db0fafe6f12469798b2ea9f3d23d9cd712b6db7e1eaf421097e0
sha256sums = 819961379909c028e321f37e27a8b1b08f1f1e3dd58680e07b541921282da532
sha256sums = ec0ca3c8051ea6d9a27a450998af8162464c224299deefc29044172940e96975
sha256sums = c5c2c48638c2a8180948bd118ffcc33c8b7ff5f9f1e4b04c8e2cafeca2bde87b
@@ -45,7 +47,7 @@ pkgname = linux-ck
optdepends = crda: to set the correct wireless channels of your country
optdepends = nvidia-ck: nVidia drivers for linux-ck
optdepends = modprobed-db: Keeps track of EVERY kernel module that has ever been probed - useful for those of us who make localmodconfig
- provides = linux-ck=4.1.11
+ provides = linux-ck=4.1.12
conflicts = kernel26-ck
conflicts = linux-ck-corex
conflicts = linux-ck-p4
@@ -69,8 +71,8 @@ pkgname = linux-ck
pkgname = linux-ck-headers
pkgdesc = Header files and scripts to build modules for linux-ck.
depends = linux-ck
- provides = linux-ck-headers=4.1.11
- provides = linux-headers=4.1.11
+ provides = linux-ck-headers=4.1.12
+ provides = linux-headers=4.1.12
conflicts = kernel26-ck-headers
conflicts = linux-ck-corex-headers
conflicts = linux-ck-p4-headers
diff --git a/PKGBUILD b/PKGBUILD
index a0e377b5550b..a10a57dd4691 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -41,7 +41,7 @@ _localmodcfg=
# a new kernel is released, but again, convenient for package bumps.
_use_current=
-# Alternative I/O scheduler by Paolo.
+# Alternative I/O scheduler by Paolo Valente
# Set this if you want it enabled globally i.e. for all devices in your system
# If you want it enabled on a device-by-device basis, leave this unset and see:
# https://wiki.archlinux.org/index.php/Linux-ck#How_to_Enable_the_BFQ_I.2FO_Scheduler
@@ -52,7 +52,7 @@ _BFQ_enable_=
pkgname=(linux-ck linux-ck-headers)
_kernelname=-ck
_srcname=linux-4.1
-pkgver=4.1.11
+pkgver=4.1.12
pkgrel=1
arch=('i686' 'x86_64')
url="https://wiki.archlinux.org/index.php/Linux-ck"
@@ -72,6 +72,7 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
'change-default-console-loglevel.patch'
# ck1
"http://ck.kolivas.org/patches/4.0/4.1/4.1-ck${_ckpatchversion}/${_ckpatchname}.bz2"
+'bfs-009-add-preempt_offset-argument-to-should_resched.patch'
# gcc
"http://repo-ck.com/source/gcc_patch/${_gcc_patch}.gz"
# bfq
@@ -80,13 +81,14 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
"${_bfqpath}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r8-for-4.1.0.patch")
sha256sums=('caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f'
'SKIP'
- 'f98156dd7ceac2849de16b38cdb7a530cd3c74833ab613e0822b7bc4583cccb1'
+ 'f3520b06e6a2b9929173c680de75f11cde9f0a380e04195d538b5de820a549ae'
'SKIP'
'b04ce2128ddb94be5ffafb4383d5c8b016760500696b1426a6e552c9a61ab27c'
'cc181fe0cfcedcd3bf606d7cce53e07dfb206d6c3549238dc7f4d0d27973d1a4'
'2b3ebf5446aa3cac279842ca00bc1f2d6b7ff1766915282c201d763dbf6ca07e'
'1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
'87726411f583862e456156fe82ef51b188e5d92e7a4bd944e01a091cd7c46428'
+ '0c8d94a0c416db0fafe6f12469798b2ea9f3d23d9cd712b6db7e1eaf421097e0'
'819961379909c028e321f37e27a8b1b08f1f1e3dd58680e07b541921282da532'
'ec0ca3c8051ea6d9a27a450998af8162464c224299deefc29044172940e96975'
'c5c2c48638c2a8180948bd118ffcc33c8b7ff5f9f1e4b04c8e2cafeca2bde87b'
@@ -113,6 +115,10 @@ prepare() {
msg "Patching source with ck2 including BFS v0.464"
patch -Np1 -i "${srcdir}/${_ckpatchname}"
+ # build issue fix for 4.1.12
+ # http://ck-hack.blogspot.com/2015/08/bfs-464-linux-41-ck2.html?showComment=1445937376359#c8153343895524903784
+ patch -Np1 -i "${srcdir}/bfs-009-add-preempt_offset-argument-to-should_resched.patch"
+
# Patch source to enable more gcc CPU optimizatons via the make nconfig
msg "Patching source with gcc patch to enable more cpus types"
patch -Np1 -i "${srcdir}/${_gcc_patch}"
diff --git a/bfs-009-add-preempt_offset-argument-to-should_resched.patch b/bfs-009-add-preempt_offset-argument-to-should_resched.patch
new file mode 100644
index 000000000000..cce5cf0a31c1
--- /dev/null
+++ b/bfs-009-add-preempt_offset-argument-to-should_resched.patch
@@ -0,0 +1,37 @@
+
+Upstream commit fe32d3cd5e8eb0f82e459763374aa80797023403 called:
+"sched/preempt: Fix cond_resched_lock() and cond_resched_softirq()"
+adds an argument 'preempt_offset' to should_resched().
+This patch adds it to BFS.
+
+Signed-off-by: Holger Hoffstätte <holger.hoffstaette@googlemail.com>
+
+--- linux-4.1.12/kernel/sched/bfs.c 2015-10-23 20:46:12.479367398 +0200
++++ linux-4.1.12-bfs/kernel/sched/bfs.c 2015-10-23 20:44:39.515377240 +0200
+@@ -4663,7 +4663,7 @@
+
+ int __sched _cond_resched(void)
+ {
+- if (should_resched()) {
++ if (should_resched(0)) {
+ preempt_schedule_common();
+ return 1;
+ }
+@@ -4681,7 +4681,7 @@
+ */
+ int __cond_resched_lock(spinlock_t *lock)
+ {
+- int resched = should_resched();
++ int resched = should_resched(PREEMPT_LOCK_OFFSET);
+ int ret = 0;
+
+ lockdep_assert_held(lock);
+@@ -4703,7 +4703,7 @@
+ {
+ BUG_ON(!in_softirq());
+
+- if (should_resched()) {
++ if (should_resched(SOFTIRQ_DISABLE_OFFSET)) {
+ local_bh_enable();
+ preempt_schedule_common();
+ local_bh_disable();