test: LTS 5.4.57

3 files changed, 68 insertions, 6 deletions

diff --git a/PKGBUILD b/PKGBUILD
index fd8716a8106a..3d3215b28389 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 # https://www.kernel.org/category/releases.html
 # 5.4 Greg Kroah-Hartman & Sasha Levin 2019-11-24 Dec, 2021
 _LLL_VER=5.4
-_LLL_SUBVER=50
+_LLL_SUBVER=57
 
 # Bisect debug, v5.4.47 -> v5.4.48
 _Bisect_debug=off # on, test, off
@@ -43,9 +43,9 @@ _UKSM_PATCH="https://raw.githubusercontent.com/dolohow/uksm/${_UKSM_COMMIT}/v5.x
 # https://github.com/Gentoo-zh/linux-cjktty
 # https://github.com/torvalds/linux/compare/v5.4...Gentoo-zh:5.4-utf8
 _CJKTTY_LLL_VER=5.4
-_CJKTTY_PATCH_FILE=linux-cjktty-${_CJKTTY_LLL_VER}.patch
+_CJKTTY_PATCH_FILE=linux-cjktty-${_CJKTTY_LLL_VER}
 _CJKTTY_PATCH_URL="https://github.com/torvalds/linux/compare/v${_CJKTTY_LLL_VER}...Gentoo-zh:${_CJKTTY_LLL_VER}-utf8.patch"
-_CJKTTY_PATCH="${_CJKTTY_PATCH_FILE}::${_CJKTTY_PATCH_URL}"
+_CJKTTY_PATCH="${_CJKTTY_PATCH_FILE}.patch::${_CJKTTY_PATCH_URL}"
 
 _PATHSET_DESC="ck${_CK_VER} uksm-${_UKSM_VER} and cjktty"
 
@@ -56,7 +56,7 @@ if [ "$_Bisect_debug" == "off" ]; then
 fi
 _srcname=linux-${_LLL_VER}
 pkgver=${_LLL_VER}.${_LLL_SUBVER}
-pkgrel=2
+pkgrel=1
 arch=('x86_64')
 url="https://www.kernel.org/"
 license=('GPL2')
@@ -72,8 +72,10 @@ source=(
         ${_CJKTTY_PATCH}
         'legacy-wireless-ioctls-4.9+.patch'
         'sphinx-workaround.patch'
+        'ck-patch-for-5.4.57+.patch'
         'uksm-patch-for-5.4.33+.patch'
         'linux-cjktty-patch-for-5.4.36+.patch'
+        'linux-cjktty-patch-for-5.4.54+.patch'
         'broken-sleep-5.4.48+.patch::https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/patch/?id=f7757368e0f0b3e108088ca7b5b8abda6faa7ebc'
         'config'         # the main kernel config file
         '60-linux.hook'  # pacman hook for depmod
@@ -87,14 +89,16 @@ validpgpkeys=(
 # https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
 sha256sums=('bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491'
             'SKIP'
-            'f510a113463889975233c14678664b3f777c744becc671e5416a3f9f21200e48'
+            '5b22c27823b8578c4e237f107658a9391d640110ce7bc4cca9f5366b5c6eaf72'
             'f445eea4d0ec2015a25f1ad625c848f4f2252099795966fa4105e0aa29674c5c'
             '81d34bf02e771a126af5cb382d44a86dcc759c88b7c89fc7e5b7737731b9130e'
             '50213f3270499fceb452946252d61f5471571c77baf3dd510fbb00cfa9831c9a'
             'edfb9939840b8710d6ee0385a8e968609eef348295465bb087744c18ed3496e0'
             'b7c814c8183e4645947a6dcc3cbf80431de8a8fd4e895b780f9a5fd92f82cb8e'
+            'a10a4848c7a9842c0c7760b087ea38a4356dc1a2c2e26334cb0106c25785554f'
             '6826624f65276927de012f040e77b02231fe6345b9da7c702deacd9372ea001e'
             '573f1c40951a6ee4cf6b07a6a8a1123b00fcd8bff29843905cf191e08f1d87f2'
+            '2c9faabb5e09b1f818b051ced3eb90b6c04aa08616952d99eedf328c7c8dda2f'
             '9f9ec5becca27bc7b65b372254bcd4c64069deff1d3b7fa15e6e416595163654'
             '7ce388e429d8df479a721285e445e116c5ee41e3126a702862e59056460b655e'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
@@ -135,6 +139,7 @@ prepare() {
   # Patch source with ck patch set
   msg "Patching source with ck${_CK_VER} including BFS"
   cp "../patch-${_LLL_VER}-ck${_CK_VER}" "../patch-${_LLL_VER}.${_LLL_SUBVER}-ck${_CK_VER}"
+  patch -i ../ck-patch-for-5.4.57+.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"
@@ -143,8 +148,9 @@ prepare() {
   patch -Np1 -i "../uksm-${_LLL_VER}.${_LLL_SUBVER}.patch"
 
   msg "Patching source with Gentoo-zh/linux-cjktty patches"
-  cp "../${_CJKTTY_PATCH_FILE}" "../${_CJKTTY_PATCH_FILE}.${_LLL_SUBVER}.patch"
+  cp "../${_CJKTTY_PATCH_FILE}.patch" "../${_CJKTTY_PATCH_FILE}.${_LLL_SUBVER}.patch"
   patch -i ../linux-cjktty-patch-for-5.4.36+.patch "../${_CJKTTY_PATCH_FILE}.${_LLL_SUBVER}.patch"
+  patch -i ../linux-cjktty-patch-for-5.4.54+.patch "../${_CJKTTY_PATCH_FILE}.${_LLL_SUBVER}.patch"
   patch -Np1 -i "../${_CJKTTY_PATCH_FILE}.${_LLL_SUBVER}.patch"
 
   msg "Patching source to reinstate the legacy wireless ioctls"
diff --git a/ck-patch-for-5.4.57+.patch b/ck-patch-for-5.4.57+.patch
new file mode 100644
index 000000000000..25a847ac5ba0
--- /dev/null
+++ b/ck-patch-for-5.4.57+.patch
@@ -0,0 +1,13 @@
+--- patch-5.4-ck1	2020-08-08 16:53:19.000000000 +0800
++++ patch-5.4.57-ck1	2020-08-08 12:51:45.000000000 +0800
+@@ -17368,9 +17368,9 @@
+ --- a/kernel/time/timer.c
+ +++ b/kernel/time/timer.c
+ @@ -43,6 +43,7 @@
+- #include <linux/sched/debug.h>
+  #include <linux/slab.h>
+  #include <linux/compat.h>
++ #include <linux/random.h>
+ +#include <linux/freezer.h>
+  
+  #include <linux/uaccess.h>
diff --git a/linux-cjktty-patch-for-5.4.54+.patch b/linux-cjktty-patch-for-5.4.54+.patch
new file mode 100644
index 000000000000..91f8d22e6443
--- /dev/null
+++ b/linux-cjktty-patch-for-5.4.54+.patch
@@ -0,0 +1,43 @@
+--- linux-cjktty-5.4.53.patch	2020-08-08 17:16:04.000000000 +0800
++++ linux-cjktty-5.4.54.patch	2020-08-08 23:18:35.000000000 +0800
+@@ -111,11 +111,11 @@
+  		notify_update(vc);
+  	}
+ @@ -1095,7 +1118,7 @@ int vc_allocate(unsigned int currcons)	/* return 0 on success */
+- 	if (!*vc->vc_uni_pagedir_loc)
+- 		con_set_default_unimap(vc);
+- 
++ 	    vc->vc_screenbuf_size > KMALLOC_MAX_SIZE || !vc->vc_screenbuf_size)
++ 		goto err_free;
++ 	err = -ENOMEM;
+ -	vc->vc_screenbuf = kzalloc(vc->vc_screenbuf_size, GFP_KERNEL);
+-+	vc->vc_screenbuf = kmalloc(vc->vc_screenbuf_size * 2, GFP_KERNEL);
+++	vc->vc_screenbuf = kzalloc(vc->vc_screenbuf_size * 2, GFP_KERNEL);
+  	if (!vc->vc_screenbuf)
+  		goto err_free;
+  
+@@ -137,11 +137,11 @@
+  	if (new_cols == vc->vc_cols && new_rows == vc->vc_rows)
+  		return 0;
+  
+- 	if (new_screen_size > KMALLOC_MAX_SIZE)
++ 	if (new_screen_size > KMALLOC_MAX_SIZE || !new_screen_size)
+  		return -EINVAL;
+ -	newscreen = kzalloc(new_screen_size, GFP_USER);
+ +
+-+	newscreen = kmalloc(new_screen_size * 2, GFP_USER);
+++	newscreen = kzalloc(new_screen_size * 2, GFP_USER);
+ +
+  	if (!newscreen)
+  		return -ENOMEM;
+@@ -245,9 +245,9 @@
+  				inverse = 0;
+  				width = 1;
+ @@ -3360,7 +3413,7 @@ static int __init con_init(void)
+- 		INIT_WORK(&vc_cons[currcons].SAK_work, vc_SAK);
+  		tty_port_init(&vc->port);
+  		visual_init(vc, currcons, 1);
++ 		/* Assuming vc->vc_{cols,rows,screenbuf_size} are sane here. */
+ -		vc->vc_screenbuf = kzalloc(vc->vc_screenbuf_size, GFP_NOWAIT);
+ +		vc->vc_screenbuf = kzalloc(vc->vc_screenbuf_size * 2, GFP_NOWAIT);
+  		vc_init(vc, vc->vc_rows, vc->vc_cols,