diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 17:42:58 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:52:02 -0800 |
| commit | bba6bd92987e7553a93b3728a8f120ad417d531a (patch) | |
| tree | 9db71810cbcacb9eea7f2cc5cceab5b9953957e6 /drivers/cpufreq | |
| parent | 0d8cdc5112f9d8a55fc34e255ee07f3c98751f80 (diff) | |
Revert "cpufreq: interactive governor: scale to max only if at min speed"
This reverts commit 460145c8b1d2ff8a2488baa10d7421e1d8179b7d.
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Rebase-Id: Racc6c054ac5c67c38dec7281c7190c6650bfb8bd
Diffstat (limited to 'drivers/cpufreq')
| -rw-r--r-- | drivers/cpufreq/cpufreq_interactive.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/cpufreq/cpufreq_interactive.c b/drivers/cpufreq/cpufreq_interactive.c index 72ae6533a2d4..a085fc86733b 100644 --- a/drivers/cpufreq/cpufreq_interactive.c +++ b/drivers/cpufreq/cpufreq_interactive.c @@ -159,14 +159,10 @@ static void cpufreq_interactive_timer(unsigned long data) if (load_since_change > cpu_load) cpu_load = load_since_change; - if (cpu_load >= go_maxspeed_load) { - if (pcpu->policy->cur == pcpu->policy->min) - new_freq = pcpu->policy->max; - else - new_freq = pcpu->policy->max * cpu_load / 100; - } else { + if (cpu_load >= go_maxspeed_load) + new_freq = pcpu->policy->max; + else new_freq = pcpu->policy->cur * cpu_load / 100; - } if (cpufreq_frequency_table_target(pcpu->policy, pcpu->freq_table, new_freq, CPUFREQ_RELATION_H, |