Merge tag 'riscv-for-linus-6.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-block.git] / kernel / sched / cpufreq_schedutil.c

diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c
index 4492608b7d7f1c715f46ae462fd760e074066ced..458d359f5991ca7977fb655da4cbb1f71b53bebc 100644 (file)
--- a/kernel/sched/cpufreq_schedutil.c
+++ b/kernel/sched/cpufreq_schedutil.c
@@ -350,7 +350,8 @@ static void sugov_update_single_freq(struct update_util_data *hook, u64 time,
         * Except when the rq is capped by uclamp_max.
         */
        if (!uclamp_rq_is_capped(cpu_rq(sg_cpu->cpu)) &&
-           sugov_cpu_is_busy(sg_cpu) && next_f < sg_policy->next_freq) {
+           sugov_cpu_is_busy(sg_cpu) && next_f < sg_policy->next_freq &&
+           !sg_policy->need_freq_update) {
                next_f = sg_policy->next_freq;
 
                /* Restore cached freq as next_freq has changed */