summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--PKGBUILD2
-rw-r--r--ck-patch-for-5.4.62+.patch24
2 files changed, 25 insertions, 1 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 1cbe21501fe6..7279d48459d6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -98,7 +98,7 @@ sha256sums=('bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491'
'edfb9939840b8710d6ee0385a8e968609eef348295465bb087744c18ed3496e0'
'b7c814c8183e4645947a6dcc3cbf80431de8a8fd4e895b780f9a5fd92f82cb8e'
'a10a4848c7a9842c0c7760b087ea38a4356dc1a2c2e26334cb0106c25785554f'
- 'cbdc582fd9c65b1ff94088ea1dcd8123f13b6abc3acca93bd6bee7cad11f9c33'
+ '0334391900f31d6aaedaa68e8917f93262ba3e523f2654774b289e9b18c1a923'
'6826624f65276927de012f040e77b02231fe6345b9da7c702deacd9372ea001e'
'573f1c40951a6ee4cf6b07a6a8a1123b00fcd8bff29843905cf191e08f1d87f2'
'2c9faabb5e09b1f818b051ced3eb90b6c04aa08616952d99eedf328c7c8dda2f'
diff --git a/ck-patch-for-5.4.62+.patch b/ck-patch-for-5.4.62+.patch
index 5b76de161241..2f2d84096228 100644
--- a/ck-patch-for-5.4.62+.patch
+++ b/ck-patch-for-5.4.62+.patch
@@ -1,5 +1,29 @@
+Fix: muqss, missing static function, uclamp_is_used
+Ref: https://github.com/zen-kernel/zen-kernel/commit/e7113f2c1d56962d4afabc627ad761c138f5b858.patch
+
--- patch-5.4.61-ck1 2020-09-04 22:10:44.000000000 +0800
+++ patch-5.4.62-ck1 2020-09-05 10:27:35.000000000 +0800
+@@ -15665,7 +15665,7 @@
+ index 000000000000..5214b158d82f
+ --- /dev/null
+ +++ b/kernel/sched/MuQSS.h
+-@@ -0,0 +1,1005 @@
++@@ -0,0 +1,1010 @@
+ +/* SPDX-License-Identifier: GPL-2.0 */
+ +#ifndef MUQSS_SCHED_H
+ +#define MUQSS_SCHED_H
+@@ -16453,6 +16453,11 @@
+ + return util;
+ +}
+ +
+++static inline bool uclamp_is_used(void)
+++{
+++ return false;
+++}
+++
+ +#ifdef arch_scale_freq_capacity
+ +#ifndef arch_scale_freq_invariant
+ +#define arch_scale_freq_invariant() (true)
@@ -16691,7 +16691,7 @@
@@ -213,7 +219,7 @@ unsigned long schedutil_cpu_util(int cpu, unsigned long util_cfs,
struct rq *rq = cpu_rq(cpu);