diff options
| -rw-r--r-- | kernel/sched/cpufreq_schedutil.c | 9 | ||||
| -rw-r--r-- | kernel/sched/fair.c | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c index 033da8f815da..e9a9ee98daf7 100644 --- a/kernel/sched/cpufreq_schedutil.c +++ b/kernel/sched/cpufreq_schedutil.c @@ -17,6 +17,11 @@ #include <trace/events/power.h> #include "sched.h" +#include "tune.h" + +#ifdef CONFIG_SCHED_WALT +unsigned long boosted_cpu_util(int cpu); +#endif /* Stub out fast switch routines present on mainline to reduce the backport * overhead. */ @@ -173,6 +178,10 @@ static void sugov_get_util(unsigned long *util, unsigned long *max, u64 time) rt = (rt * max_cap) >> SCHED_CAPACITY_SHIFT; *util = min(rq->cfs.avg.util_avg + rt, max_cap); +#ifdef CONFIG_SCHED_WALT + if (!walt_disabled && sysctl_sched_use_walt_cpu_util) + *util = boosted_cpu_util(cpu); +#endif *max = max_cap; } diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index baba2d34c34e..abe49df1e6f0 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -4258,7 +4258,7 @@ static inline void hrtick_update(struct rq *rq) #ifdef CONFIG_SMP static bool cpu_overutilized(int cpu); -static inline unsigned long boosted_cpu_util(int cpu); +unsigned long boosted_cpu_util(int cpu); #else #define boosted_cpu_util(cpu) cpu_util(cpu) #endif @@ -5478,7 +5478,7 @@ schedtune_task_margin(struct task_struct *task) #endif /* CONFIG_SCHED_TUNE */ -static inline unsigned long +unsigned long boosted_cpu_util(int cpu) { unsigned long util = cpu_util(cpu); |