1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
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);
- 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;
|