From f237cdba42530f97e3aeaa2e56380c0150e6dee2 Mon Sep 17 00:00:00 2001 From: Joakim Hernberg Date: Wed, 26 Oct 2016 14:17:13 +0200 Subject: bump to 4.4.27_rt37-1 --- .SRCINFO | 18 +++++++--------- 0001-fix-dcache-try-1.patch | 51 --------------------------------------------- PKGBUILD | 21 +++++++------------ 3 files changed, 16 insertions(+), 74 deletions(-) delete mode 100644 0001-fix-dcache-try-1.patch diff --git a/.SRCINFO b/.SRCINFO index c86d7c9..ac62a35 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ # Generated by makepkg 5.0.1 -# Thu Sep 22 16:59:23 UTC 2016 +# Wed Oct 26 12:15:21 UTC 2016 pkgbase = linux-rt-lts - pkgver = 4.4.21_rt30 + pkgver = 4.4.27_rt37 pkgrel = 1 url = http://www.kernel.org/ arch = i686 @@ -15,16 +15,15 @@ pkgbase = linux-rt-lts options = !strip source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.sign - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.21.xz - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.21.sign - source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/older/patch-4.4.21-rt30.patch.xz - source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/older/patch-4.4.21-rt30.patch.sign + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.27.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.27.sign + source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patch-4.4.27-rt37.patch.xz + source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patch-4.4.27-rt37.patch.sign source = config source = config.x86_64 source = linux-rt-lts.preset source = change-default-console-loglevel.patch source = fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT-160319.patch - source = 0001-fix-dcache-try-1.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E validpgpkeys = 64254695FFF0AA4466CC19E67B96E8162A8CF5D1 @@ -32,16 +31,15 @@ pkgbase = linux-rt-lts validpgpkeys = E644E2F1D45FA0B2EAA02F33109F098506FF0B14 sha256sums = 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2 sha256sums = SKIP - sha256sums = 278c4ea17ef539e81cb597f0e7e84750649d0f7fddcb27d99abfcb46da9db737 + sha256sums = 578caffa00f5056a921f672c585734cd572b1e3e33227b71a54ef27873f7ea20 sha256sums = SKIP - sha256sums = d5d0b6e991a4436d7e0e02f32e7f8580555be6d0d8886d1205aa841b89781a13 + sha256sums = fcbcda45be2bdb11c81cabdd5e88069731a7a88cdde5e60ad91b3e9bccded7b9 sha256sums = SKIP sha256sums = 1f609d41a9d5cd0eb88060bd0ad6726f76e9dbf0deee44d6fe3dc57f0fbb3191 sha256sums = b28728fa4816c4f32b4b390b22c8b9d4ea52a35b150ed7041d325ab72cd8c6a3 sha256sums = a8886f2c9896f81f59cf0413b3e380cda2fbdc667eb9ce8dfcb0fceb6d92279f sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99 sha256sums = 85f7612edfa129210343d6a4fe4ba2a4ac3542d98b7e28c8896738e7e6541c06 - sha256sums = 8b96ecc7c4c1dc5fc81162d010d69606b590f0feee0563aee875706e0ab4d5f9 pkgname = linux-rt-lts pkgdesc = The Linux-rt-lts kernel and modules diff --git a/0001-fix-dcache-try-1.patch b/0001-fix-dcache-try-1.patch deleted file mode 100644 index b3c78b5..0000000 --- a/0001-fix-dcache-try-1.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 970e0abab56f86e253ee6d26b1495cb25293318b Mon Sep 17 00:00:00 2001 -From: Joakim Hernberg -Date: Fri, 2 Sep 2016 18:27:44 +0200 -Subject: [PATCH] fix dcache - try 1 - ---- - fs/dcache.c | 14 +++----------- - 1 file changed, 3 insertions(+), 11 deletions(-) - -diff --git a/fs/dcache.c b/fs/dcache.c -index 32c0bfe..4adb399 100644 ---- a/fs/dcache.c -+++ b/fs/dcache.c -@@ -579,6 +579,7 @@ static struct dentry *dentry_kill(struct dentry *dentry) - - failed: - spin_unlock(&dentry->d_lock); -+ cpu_chill(); - return dentry; /* try again with same dentry */ - } - -@@ -752,8 +753,6 @@ void dput(struct dentry *dentry) - return; - - repeat: -- might_sleep(); -- - rcu_read_lock(); - if (likely(fast_dput(dentry))) { - rcu_read_unlock(); -@@ -785,15 +784,8 @@ repeat: - - kill_it: - dentry = dentry_kill(dentry); -- if (dentry) { -- int r; -- -- /* the task with the highest priority won't schedule */ -- r = cond_resched(); -- if (!r) -- cpu_chill(); -- goto repeat; -- } -+ if (dentry) -+ goto repeat; - } - EXPORT_SYMBOL(dput); - --- -2.9.3 - diff --git a/PKGBUILD b/PKGBUILD index b13cfaf..c202c59 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,8 +7,8 @@ #pkgbase=linux # Build stock -ARCH kernel pkgbase=linux-rt-lts # Build kernel with a different name _srcname=linux-4.4 -_pkgver=4.4.21 -_rtpatchver=rt30 +_pkgver=4.4.27 +_rtpatchver=rt37 pkgver=${_pkgver}_${_rtpatchver} pkgrel=1 arch=('i686' 'x86_64') @@ -20,28 +20,26 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" "https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.sign" "https://www.kernel.org/pub/linux/kernel/v4.x/patch-${_pkgver}.xz" "https://www.kernel.org/pub/linux/kernel/v4.x/patch-${_pkgver}.sign" - "https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/older/patch-${_pkgver}-${_rtpatchver}.patch.xz" - "https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/older/patch-${_pkgver}-${_rtpatchver}.patch.sign" + "https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patch-${_pkgver}-${_rtpatchver}.patch.xz" + "https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patch-${_pkgver}-${_rtpatchver}.patch.sign" # the main kernel config files 'config' 'config.x86_64' # standard config files for mkinitcpio ramdisk "${pkgbase}.preset" 'change-default-console-loglevel.patch' - 'fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT-160319.patch' - '0001-fix-dcache-try-1.patch') + 'fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT-160319.patch') sha256sums=('401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2' 'SKIP' - '278c4ea17ef539e81cb597f0e7e84750649d0f7fddcb27d99abfcb46da9db737' + '578caffa00f5056a921f672c585734cd572b1e3e33227b71a54ef27873f7ea20' 'SKIP' - 'd5d0b6e991a4436d7e0e02f32e7f8580555be6d0d8886d1205aa841b89781a13' + 'fcbcda45be2bdb11c81cabdd5e88069731a7a88cdde5e60ad91b3e9bccded7b9' 'SKIP' '1f609d41a9d5cd0eb88060bd0ad6726f76e9dbf0deee44d6fe3dc57f0fbb3191' 'b28728fa4816c4f32b4b390b22c8b9d4ea52a35b150ed7041d325ab72cd8c6a3' 'a8886f2c9896f81f59cf0413b3e380cda2fbdc667eb9ce8dfcb0fceb6d92279f' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' - '85f7612edfa129210343d6a4fe4ba2a4ac3542d98b7e28c8896738e7e6541c06' - '8b96ecc7c4c1dc5fc81162d010d69606b590f0feee0563aee875706e0ab4d5f9') + '85f7612edfa129210343d6a4fe4ba2a4ac3542d98b7e28c8896738e7e6541c06') validpgpkeys=('ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman @@ -65,9 +63,6 @@ prepare() { # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git - msg "0001-fix-dcache-try-1.patch" - patch -p1 -i "${srcdir}/0001-fix-dcache-try-1.patch" - # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) -- cgit v1.2.3