diff options
Diffstat (limited to 'kernel/sched/cpufreq_schedutil.c')
-rw-r--r-- | kernel/sched/cpufreq_schedutil.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c index d84e036a7536..636ca6f88c8e 100644 --- a/kernel/sched/cpufreq_schedutil.c +++ b/kernel/sched/cpufreq_schedutil.c | |||
@@ -196,8 +196,9 @@ static unsigned int get_next_freq(struct sugov_policy *sg_policy, | |||
196 | * based on the task model parameters and gives the minimal utilization | 196 | * based on the task model parameters and gives the minimal utilization |
197 | * required to meet deadlines. | 197 | * required to meet deadlines. |
198 | */ | 198 | */ |
199 | unsigned long schedutil_freq_util(int cpu, unsigned long util_cfs, | 199 | unsigned long schedutil_cpu_util(int cpu, unsigned long util_cfs, |
200 | unsigned long max, enum schedutil_type type) | 200 | unsigned long max, enum schedutil_type type, |
201 | struct task_struct *p) | ||
201 | { | 202 | { |
202 | unsigned long dl_util, util, irq; | 203 | unsigned long dl_util, util, irq; |
203 | struct rq *rq = cpu_rq(cpu); | 204 | struct rq *rq = cpu_rq(cpu); |
@@ -230,7 +231,7 @@ unsigned long schedutil_freq_util(int cpu, unsigned long util_cfs, | |||
230 | */ | 231 | */ |
231 | util = util_cfs + cpu_util_rt(rq); | 232 | util = util_cfs + cpu_util_rt(rq); |
232 | if (type == FREQUENCY_UTIL) | 233 | if (type == FREQUENCY_UTIL) |
233 | util = uclamp_util(rq, util); | 234 | util = uclamp_util_with(rq, util, p); |
234 | 235 | ||
235 | dl_util = cpu_util_dl(rq); | 236 | dl_util = cpu_util_dl(rq); |
236 | 237 | ||
@@ -290,7 +291,7 @@ static unsigned long sugov_get_util(struct sugov_cpu *sg_cpu) | |||
290 | sg_cpu->max = max; | 291 | sg_cpu->max = max; |
291 | sg_cpu->bw_dl = cpu_bw_dl(rq); | 292 | sg_cpu->bw_dl = cpu_bw_dl(rq); |
292 | 293 | ||
293 | return schedutil_freq_util(sg_cpu->cpu, util, max, FREQUENCY_UTIL); | 294 | return schedutil_cpu_util(sg_cpu->cpu, util, max, FREQUENCY_UTIL, NULL); |
294 | } | 295 | } |
295 | 296 | ||
296 | /** | 297 | /** |