summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorshmilee2018-11-13 10:46:13 +0800
committershmilee2018-11-13 11:08:14 +0800
commitd0e0b7f7a9d62ad28ea030547c5c81c3c4308513 (patch)
tree9cf7fd742001807a65b5d06302b02443495a32fa
parente5acfdbbc64258f146a7a01a253b79a7a486ced7 (diff)
downloadaur-d0e0b7f7a9d62ad28ea030547c5c81c3c4308513.tar.gz
update to LTS 4.9.136
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD7
-rw-r--r--ck-patch-for-4.9.135+.patch22
3 files changed, 32 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3b5a564a591..5094d78cff5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,5 @@
-# Generated by makepkg 5.1.1
-# Sat Sep 8 13:51:46 UTC 2018
pkgbase = linux-shmilee
- pkgver = 4.9.125
+ pkgver = 4.9.136
pkgrel = 1
url = https://www.kernel.org/
arch = x86_64
@@ -14,9 +12,10 @@ pkgbase = linux-shmilee
options = !strip
source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz
source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.sign
- source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.125.xz
+ source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.136.xz
source = http://ck.kolivas.org/patches/4.0/4.9/4.9-ck1/patch-4.9-ck1.xz
source = ck-patch-for-4.9.117+.patch
+ source = ck-patch-for-4.9.135+.patch
source = https://raw.githubusercontent.com/dolohow/uksm/676f9bb2a6da8705e463adc2161f70e00f150238/uksm-4.9.patch
source = linux-cjktty-4.9.patch::https://github.com/torvalds/linux/compare/v4.9...Gentoo-zh:4.9-utf8.patch
source = linux-cjktty-patch-for-4.9.112+.patch
@@ -28,9 +27,10 @@ pkgbase = linux-shmilee
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
sha256sums = 029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a
sha256sums = SKIP
- sha256sums = 32d94daf7f01d43a4774d6c4045b89655e6e975ddd6f6792553173c675aef299
+ sha256sums = 9ca1d89c5997ab84b16bbe1e7dabe916751f934ab6e8cc0ad0743a7ea11c813d
sha256sums = 5b9d8f4ef73f87e8595de66ccc38bad86e290fd9453bd536b9cc950f5344b82d
sha256sums = 83083a6afc8be5504629049d6659beb6d2e8412a50db4caa4c1bec2a0d3ec2d7
+ sha256sums = a020096879c2a2b7f041cc34e4f4970fbb7af9fdad6903987fa80864bd00fcb3
sha256sums = 65fae53b7ac44a9f3ffdcf5722e70f248ffcc183583b686066a766d27f269e1d
sha256sums = 41acf07ce9316ec2d4149331e92223dc59d2f2090efb7b71cd96522a5ba9bf48
sha256sums = afda821d57be33c5e93390e353b1aa99bd0bd41dff70feac90249097b9b44ea9
diff --git a/PKGBUILD b/PKGBUILD
index d550b6c65ac..90bf2748d76 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
# https://www.kernel.org/category/releases.html
# 4.9 Greg Kroah-Hartman 2016-12-11 2023-01
_LLL_VER=4.9
-_LLL_SUBVER=125
+_LLL_SUBVER=136
# NUMA is optimized for multi-socket motherboards.
# A single multi-core CPU can actually run slower with NUMA enabled.
@@ -59,6 +59,7 @@ source=(
#"https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.sign"
${_CK_PATCH}
'ck-patch-for-4.9.117+.patch'
+ 'ck-patch-for-4.9.135+.patch'
${_UKSM_PATCH}
${_CJKTTY_PATCH}
'linux-cjktty-patch-for-4.9.112+.patch'
@@ -74,9 +75,10 @@ validpgpkeys=(
# https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
sha256sums=('029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a'
'SKIP'
- '32d94daf7f01d43a4774d6c4045b89655e6e975ddd6f6792553173c675aef299'
+ '9ca1d89c5997ab84b16bbe1e7dabe916751f934ab6e8cc0ad0743a7ea11c813d'
'5b9d8f4ef73f87e8595de66ccc38bad86e290fd9453bd536b9cc950f5344b82d'
'83083a6afc8be5504629049d6659beb6d2e8412a50db4caa4c1bec2a0d3ec2d7'
+ 'a020096879c2a2b7f041cc34e4f4970fbb7af9fdad6903987fa80864bd00fcb3'
'65fae53b7ac44a9f3ffdcf5722e70f248ffcc183583b686066a766d27f269e1d'
'41acf07ce9316ec2d4149331e92223dc59d2f2090efb7b71cd96522a5ba9bf48'
'afda821d57be33c5e93390e353b1aa99bd0bd41dff70feac90249097b9b44ea9'
@@ -102,6 +104,7 @@ prepare() {
msg "Patching source with ck${_CK_VER} including BFS BFQ"
cp "../patch-${_LLL_VER}-ck${_CK_VER}" "../patch-${_LLL_VER}.${_LLL_SUBVER}-ck${_CK_VER}"
patch -i ../ck-patch-for-4.9.117+.patch "../patch-${_LLL_VER}.${_LLL_SUBVER}-ck${_CK_VER}"
+ patch -i ../ck-patch-for-4.9.135+.patch "../patch-${_LLL_VER}.${_LLL_SUBVER}-ck${_CK_VER}"
patch -Np1 -i "../patch-${_LLL_VER}.${_LLL_SUBVER}-ck${_CK_VER}"
msg "Patching source with uksm ${_UKSM_VER} patches"
diff --git a/ck-patch-for-4.9.135+.patch b/ck-patch-for-4.9.135+.patch
new file mode 100644
index 00000000000..a82add31546
--- /dev/null
+++ b/ck-patch-for-4.9.135+.patch
@@ -0,0 +1,22 @@
+--- patch-4.9-ck1 2018-11-13 10:09:22.000000000 +0800
++++ patch-4.9.135-ck1 2018-11-13 10:23:33.000000000 +0800
+@@ -22846,8 +22846,8 @@
+ +
+ +#ifdef CONFIG_IRQ_TIME_ACCOUNTING
+ +struct irqtime {
+-+ u64 hardirq_time;
+-+ u64 softirq_time;
+++ u64 total;
+++ u64 tick_delta;
+ + u64 irq_start_time;
+ + struct u64_stats_sync sync;
+ +};
+@@ -22862,7 +22862,7 @@
+ +
+ + do {
+ + seq = __u64_stats_fetch_begin(&irqtime->sync);
+-+ total = irqtime->softirq_time + irqtime->hardirq_time;
+++ total = irqtime->total;
+ + } while (__u64_stats_fetch_retry(&irqtime->sync, seq));
+ +
+ + return total;