diff options
| -rw-r--r-- | PKGBUILD | 20 | ||||
| -rw-r--r-- | config | 8 | ||||
| -rw-r--r-- | fix-ck1_for_5.7.14.patch (renamed from unscrew-ck1_for_5.7.14.patch) | 0 | ||||
| -rw-r--r-- | fix-ck1_for_5.7.17.patch | 14 | ||||
| -rw-r--r-- | unscrew-ck1-muqss-Add-missing-static-function-uclamp_is_used.patch | 37 |
5 files changed, 69 insertions, 10 deletions
@@ -21,7 +21,7 @@ _custom=1 pkgbase=linux-ck _supver=5 _majver=7 -_minver=16 +_minver=17 _gccpatchver='20200615' _gccpatchger='10.1' _gccpatchker='5.7' @@ -54,16 +54,18 @@ source=( raid6-default-algo.patch config # the main kernel config file sphinx-workaround.patch + fix-ck1_for_5.7.14.patch + fix-ck1_for_5.7.17.patch unscrew-ck1.patch::https://github.com/ckolivas/linux/commit/0b69e633d6b0b08ae8547dc4099c8c0985019553.patch unscrew-ck1-fix-suspend-to-ram.patch::https://github.com/zen-kernel/zen-kernel/commit/fb7e2cfaf61cf5f9c2336331e73296f455bd2d51.patch - unscrew-ck1_for_5.7.14.patch + unscrew-ck1-muqss-Add-missing-static-function-uclamp_is_used.patch::https://github.com/zen-kernel/zen-kernel/commit/e7113f2c1d56962d4afabc627ad761c138f5b858.patch ) validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman ) # https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -b2sums=('578e4e65bd4f96e8a1ab462fd7b6ca5450d7cc51fe24bb9df1d664188a61d755f91185674f9b503051ff771336d2fc75f37f04d0ea93a5f6738556802097f6d9' +b2sums=('ef73f9c940d678465d1ff2c4eb880b6878827f563942666aab0fb49be9c24d6a12a78a2c569c9cb35023c82a195945b392ca00a933726701c0cff092f71141b6' 'SKIP' 'ab1fb19c67d4c107f75767581c33d9c1458b4d9fdb88f4adb41d30a36f5a2f95f1c48ef079eb87e1e6e8ce2f98b293195cb2c0f2a8ec975aa817453289158c6e' '490c7d188215f1d24b5807a744853fa308c2cd17c9eb8668918a50a0c58cab9cbc9ee13ac9abbb614eb010a4a56e9092fea4440d44c80c8e67f2d9abdf19a83f' @@ -72,11 +74,13 @@ b2sums=('578e4e65bd4f96e8a1ab462fd7b6ca5450d7cc51fe24bb9df1d664188a61d755f911856 'c8d0697f99fe6105815217b8ec059d8f587415ea8dd2b88a65e1087feedf697341a64cd56810fde9e7aeada79125fc8235faccc7e7b06492c099e27a8abbe99c' '2e58bb89b247b1678355368956e67c1de51fcde97a227b2162f6771e30f17fa5520faafe7be4b6816a542e7ae10d05f64c6b6354f352c12746d4b8da632936dd' 'fde132f3705d908e6f2147c78a2193289916d72304ca5efa2229d79fc3e57a857314ce94e71425caef2f7f7b6cf87f05ef86335dc8bd4be78e7035afe608005a' - '4c6da586168ebc0892146146221919c49091c6298cdc653b9ce9547924f08427d592aa4c95ba75760aecb77c8157e18fd95a8b83a1cc6f9e1c80e6832aaa5fe7' + '2c1c121a7309ac80a7641331f3796d862bc42d91c1b388f74bfca1b94cee33cd37467215743b50039adbf4da090aa6b44c37f9d815ae0a638cbfecb4853b3237' 'b4e1377d97ad7e8144d6e55b6d43731e3271a5aec65b65ca6d81026a95f15f549b9303fb3c6f492099ca691e3f65f4cf7f0c3aa742df03b396d7f6d81813aa95' + '101954510585f61fb7a4ab802bdcad26927224d840c10675189b5bd48d141d78caea152863c6ad5140d5933d2215d959cd868a61c06076b749fe36b94dcb17b1' + 'fb7fc6ae5df7765b5f28350032469d756ff9bad4de73395ded1c242f402e7c326f963627dcb35a92ac0e8011a17de03cfccf50a40faa4147e43bb9dd5f7d7028' '84c9438120100bb5b21122a29344b9e818514d94a31b6d57519a6e25385cb7f91a7f87c930da55c828c7a4330959a94b8a3a3d56773c46b335e1380cd00180b1' '5dfb38f2096f27cf436afa6ac41d432f4e23295deb26d12146b31c57db85a8be59819f08f9c5197183c26c557b32e967edded22206c1abb9b89b83e61450ec5c' - '101954510585f61fb7a4ab802bdcad26927224d840c10675189b5bd48d141d78caea152863c6ad5140d5933d2215d959cd868a61c06076b749fe36b94dcb17b1') + '5c56a6bcf03b8b771cf5a96161eaded2ff987732e41b09c31c4c894a42d300167c9acbed49e35ef6cf86cd8c986bd57ddd3dc9552914a2804559447a6ce9efb2') #export KBUILD_BUILD_HOST=arc4linux export KBUILD_BUILD_USER=$pkgbase @@ -105,7 +109,10 @@ prepare() { sed -i -re "s/^(.EXTRAVERSION).*$/\1 = /" "../linux-ck-patch-${_supver}.${_majver}-${_ckpatchversion}" # changes from 5.7.13 to 5.7.14 breaks ck1 - patch -Np1 -i ../unscrew-ck1_for_5.7.14.patch ../linux-ck-patch-5.7-ck1 + patch -Np1 -i ../fix-ck1_for_5.7.14.patch ../linux-ck-patch-5.7-ck1 + + # changes from 5.7.16 to 5.7.17 breaks ck1 + patch -Np1 -i ../fix-ck1_for_5.7.17.patch ../linux-ck-patch-5.7-ck1 # ck patch echo "Applying ck patch" @@ -114,6 +121,7 @@ prepare() { # ck hotfix patch -Np1 -i ../unscrew-ck1.patch patch -Np1 -i ../unscrew-ck1-fix-suspend-to-ram.patch + patch -Np1 -i ../unscrew-ck1-muqss-Add-missing-static-function-uclamp_is_used.patch # graysky gcc patch @@ -1,14 +1,14 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.7.11 Kernel Configuration +# Linux/x86 5.7.17 Kernel Configuration # # -# Compiler: gcc (GCC) 10.1.0 +# Compiler: gcc (GCC) 10.2.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=100100 -CONFIG_LD_VERSION=234000000 +CONFIG_GCC_VERSION=100200 +CONFIG_LD_VERSION=235000000 CONFIG_CLANG_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_HAS_ASM_GOTO=y diff --git a/unscrew-ck1_for_5.7.14.patch b/fix-ck1_for_5.7.14.patch index c443634..c443634 100644 --- a/unscrew-ck1_for_5.7.14.patch +++ b/fix-ck1_for_5.7.14.patch diff --git a/fix-ck1_for_5.7.17.patch b/fix-ck1_for_5.7.17.patch new file mode 100644 index 0000000..aa83ead --- /dev/null +++ b/fix-ck1_for_5.7.17.patch @@ -0,0 +1,14 @@ +Thanks to ooo for pointing this out +https://aur.archlinux.org/packages/linux-ck/#comment-762177 + +--- a/patch-5.7-ck1 2020-06-10 00:59:29.000000000 +0300 ++++ b/patch-5.7-ck1 2020-08-23 13:42:46.304190376 +0300 +@@ -12162,7 +12162,7 @@ + @@ -211,7 +217,7 @@ unsigned long schedutil_cpu_util(int cpu, unsigned long util_cfs, + struct rq *rq = cpu_rq(cpu); + +- if (!IS_BUILTIN(CONFIG_UCLAMP_TASK) && ++ if (!uclamp_is_used() && + - type == FREQUENCY_UTIL && rt_rq_is_runnable(&rq->rt)) { + + type == FREQUENCY_UTIL && rt_rq_runnable(rq)) { + return max; diff --git a/unscrew-ck1-muqss-Add-missing-static-function-uclamp_is_used.patch b/unscrew-ck1-muqss-Add-missing-static-function-uclamp_is_used.patch new file mode 100644 index 0000000..002b1f4 --- /dev/null +++ b/unscrew-ck1-muqss-Add-missing-static-function-uclamp_is_used.patch @@ -0,0 +1,37 @@ +From e7113f2c1d56962d4afabc627ad761c138f5b858 Mon Sep 17 00:00:00 2001 +From: Steven Barrett <steven@liquorix.net> +Date: Sat, 22 Aug 2020 15:35:09 -0500 +Subject: [PATCH] muqss: Add missing static function, uclamp_is_used +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fix build error after stable patches below was merged: + - sched/uclamp: Protect uclamp fast path code with static key + +Build error: + +kernel/sched/cpufreq_schedutil.c: In function ‘schedutil_cpu_util’: +kernel/sched/cpufreq_schedutil.c:219:7: error: implicit declaration of function ‘uclamp_is_used’ [-Werror=implicit-function-declaration] + 219 | if (!uclamp_is_used() && + | ^~~~~~~~~~~~~~ +--- + kernel/sched/MuQSS.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/kernel/sched/MuQSS.h b/kernel/sched/MuQSS.h +index b34f2797e44f0..527819692c320 100644 +--- a/kernel/sched/MuQSS.h ++++ b/kernel/sched/MuQSS.h +@@ -810,6 +810,11 @@ unsigned int uclamp_rq_util_with(struct rq __maybe_unused *rq, unsigned int util + return util; + } + ++static inline bool uclamp_is_used(void) ++{ ++ return false; ++} ++ + #ifndef arch_scale_freq_tick + static __always_inline + void arch_scale_freq_tick(void) |