Merge "cpufreq: schedutil: Don't jump to max frequency for RT tasks" into msm-4.9
diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c
index 27d96e2..8410cf1 100644
--- a/kernel/sched/cpufreq_schedutil.c
+++ b/kernel/sched/cpufreq_schedutil.c
@@ -206,6 +206,8 @@
if (!sugov_should_update_freq(sg_policy, time))
return;
+ flags &= ~SCHED_CPUFREQ_RT_DL;
+
if (flags & SCHED_CPUFREQ_RT_DL) {
next_f = policy->cpuinfo.max_freq;
} else {
@@ -278,6 +280,8 @@
sugov_get_util(&util, &max);
+ flags &= ~SCHED_CPUFREQ_RT_DL;
+
raw_spin_lock(&sg_policy->update_lock);
sg_cpu->util = util;