From dbc9f181c97ee8a3b02e08ffc85760557e7a670c Mon Sep 17 00:00:00 2001 From: Joakim Hernberg Date: Tue, 6 Sep 2016 01:07:03 +0200 Subject: bump to 4.4.19-rt19_rt27-1 --- .SRCINFO | 22 +++++----- 0001-fix-dcache-try-1.patch | 51 ++++++++++++++++++++++ ...-4b44f2d18a330565227a7348844493c59366171e.patch | 36 +++++++++++++++ PKGBUILD | 28 ++++++------ 4 files changed, 114 insertions(+), 23 deletions(-) create mode 100644 0001-fix-dcache-try-1.patch create mode 100644 Fix-a-compilation-issue-introduced-by-upstream-commit-4b44f2d18a330565227a7348844493c59366171e.patch diff --git a/.SRCINFO b/.SRCINFO index f0ea8fb..6ef89a4 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ # Generated by makepkg 5.0.1 -# Thu Aug 18 18:47:47 UTC 2016 +# Mon Sep 5 00:49:13 UTC 2016 pkgbase = linux-rt-lts - pkgver = 4.4.17_rt25 + pkgver = 4.4.19_rt27 pkgrel = 1 url = http://www.kernel.org/ arch = i686 @@ -15,16 +15,17 @@ 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.17.xz - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.17.sign - source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patch-4.4.17-rt25.patch.xz - source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patch-4.4.17-rt25.patch.sign + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.19.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.19.sign + source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patch-4.4.19-rt27.patch.xz + source = https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patch-4.4.19-rt27.patch.sign source = config source = config.x86_64 source = linux-rt-lts.preset source = change-default-console-loglevel.patch - source = 0001-sdhci-revert.patch source = fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT-160319.patch + source = Fix-a-compilation-issue-introduced-by-upstream-commit-4b44f2d18a330565227a7348844493c59366171e.patch + source = 0001-fix-dcache-try-1.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E validpgpkeys = 64254695FFF0AA4466CC19E67B96E8162A8CF5D1 @@ -32,16 +33,17 @@ pkgbase = linux-rt-lts validpgpkeys = E644E2F1D45FA0B2EAA02F33109F098506FF0B14 sha256sums = 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2 sha256sums = SKIP - sha256sums = 294960bddb6dcef7c80d80aa13b7d1fb9c4555975f16196b9dddb05728436604 + sha256sums = 61b34a8ab4ba778c50a6fb04471cb34192e179db68440d81b12694e45dea00fc sha256sums = SKIP - sha256sums = 102eb54d7593d45a1a837c37a51551623681fcd2b0f0f03deea08f635cfc869c + sha256sums = bce223bb6b00d7bd9479edcc75a5042925140a45de46269ad274726894d61af9 sha256sums = SKIP sha256sums = 1f609d41a9d5cd0eb88060bd0ad6726f76e9dbf0deee44d6fe3dc57f0fbb3191 sha256sums = b28728fa4816c4f32b4b390b22c8b9d4ea52a35b150ed7041d325ab72cd8c6a3 sha256sums = a8886f2c9896f81f59cf0413b3e380cda2fbdc667eb9ce8dfcb0fceb6d92279f sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99 - sha256sums = 5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375 sha256sums = 85f7612edfa129210343d6a4fe4ba2a4ac3542d98b7e28c8896738e7e6541c06 + sha256sums = 9f66f554bfae117d45d7c73db136dd1d46fd7364962aa7fd2324ba9f1c85ba3f + 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 new file mode 100644 index 0000000..b3c78b5 --- /dev/null +++ b/0001-fix-dcache-try-1.patch @@ -0,0 +1,51 @@ +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/Fix-a-compilation-issue-introduced-by-upstream-commit-4b44f2d18a330565227a7348844493c59366171e.patch b/Fix-a-compilation-issue-introduced-by-upstream-commit-4b44f2d18a330565227a7348844493c59366171e.patch new file mode 100644 index 0000000..e99aeb5 --- /dev/null +++ b/Fix-a-compilation-issue-introduced-by-upstream-commit-4b44f2d18a330565227a7348844493c59366171e.patch @@ -0,0 +1,36 @@ +From Juerg Haefliger <> +Subject [PATCH] hyperv: Fix compilation issue with 4.4.19-rt27 +Date Thu, 1 Sep 2016 10:57:14 +0200 + +Fix a compilation issue introduced by upstream commit 4b44f2d18a330565227a7348844493c59366171e + +The upstream commit exports the symbol add_interrupt_randomness() +which is now being used in the Hyper-V driver. The RT patch adds another +argument to that function so its usage in the Hyper-V driver needs to +be fixed. + +This patch should be merged with: +patches/0216-random-Make-it-work-on-rt.patch +commit 20985550b01a21ba00a587d17d7c26da61e01acc random: Make it work on rt + +Signed-off-by: Juerg Haefliger +Reviewed-by: T Makphaibulchoke +--- +drivers/hv/vmbus_drv.c | 2 +- +1 file changed, 1 insertion(+), 1 deletion(-) +diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c +index 9b5440f6b3b4..c9c4899834f2 100644 +--- a/drivers/hv/vmbus_drv.c ++++ b/drivers/hv/vmbus_drv.c +@@ -828,7 +828,7 @@ static void vmbus_isr(void) + tasklet_schedule(&msg_dpc); + } + +- add_interrupt_randomness(HYPERVISOR_CALLBACK_VECTOR, 0); ++ add_interrupt_randomness(HYPERVISOR_CALLBACK_VECTOR, 0, 0); + } + + +-- +2.9.3 + diff --git a/PKGBUILD b/PKGBUILD index 0c09325..9917dd6 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.17 -_rtpatchver=rt25 +_pkgver=4.4.19 +_rtpatchver=rt27 pkgver=${_pkgver}_${_rtpatchver} pkgrel=1 arch=('i686' 'x86_64') @@ -27,21 +27,23 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" # standard config files for mkinitcpio ramdisk "${pkgbase}.preset" 'change-default-console-loglevel.patch' - '0001-sdhci-revert.patch' - 'fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT-160319.patch') + 'fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT-160319.patch' + 'Fix-a-compilation-issue-introduced-by-upstream-commit-4b44f2d18a330565227a7348844493c59366171e.patch' + '0001-fix-dcache-try-1.patch') sha256sums=('401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2' 'SKIP' - '294960bddb6dcef7c80d80aa13b7d1fb9c4555975f16196b9dddb05728436604' + '61b34a8ab4ba778c50a6fb04471cb34192e179db68440d81b12694e45dea00fc' 'SKIP' - '102eb54d7593d45a1a837c37a51551623681fcd2b0f0f03deea08f635cfc869c' + 'bce223bb6b00d7bd9479edcc75a5042925140a45de46269ad274726894d61af9' 'SKIP' '1f609d41a9d5cd0eb88060bd0ad6726f76e9dbf0deee44d6fe3dc57f0fbb3191' 'b28728fa4816c4f32b4b390b22c8b9d4ea52a35b150ed7041d325ab72cd8c6a3' 'a8886f2c9896f81f59cf0413b3e380cda2fbdc667eb9ce8dfcb0fceb6d92279f' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' - '5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375' - '85f7612edfa129210343d6a4fe4ba2a4ac3542d98b7e28c8896738e7e6541c06') + '85f7612edfa129210343d6a4fe4ba2a4ac3542d98b7e28c8896738e7e6541c06' + '9f66f554bfae117d45d7c73db136dd1d46fd7364962aa7fd2324ba9f1c85ba3f' + '8b96ecc7c4c1dc5fc81162d010d69606b590f0feee0563aee875706e0ab4d5f9') validpgpkeys=('ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman @@ -65,11 +67,11 @@ prepare() { # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git - # revert http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=9faac7b95ea4f9e83b7a914084cc81ef1632fd91 - # fixes #47778 sdhci broken on some boards - # https://bugzilla.kernel.org/show_bug.cgi?id=106541 - msg "0001-sdhci-revert.patch" - patch -Rp1 -i "${srcdir}/0001-sdhci-revert.patch" + msg "Fix-a-compilation-issue-introduced-by-upstream-commit-4b44f2d18a330565227a7348844493c59366171e.patch" + patch -p1 -i "${srcdir}/Fix-a-compilation-issue-introduced-by-upstream-commit-4b44f2d18a330565227a7348844493c59366171e.patch" + + 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 -- cgit v1.2.3