diff options
| author | Junjie Wu <junjiew@codeaurora.org> | 2015-07-20 10:20:08 -0700 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 20:03:23 -0700 |
| commit | 7ebf7c3881f22f25ed64724c06d44d5142b3912b (patch) | |
| tree | c776486561ba87227fc5e052c8da19b5209010e0 | |
| parent | 4a461ca55718062d60cfe515a41a64103aa0e9b3 (diff) | |
cpufreq: interactive: Correctly reschedule timer for slack_only case
Slack timer's expire field was not correctly initialized if slack_only
is true in cpufreq_interactive_timer_resched(). This causes both
compilation warning and functional breakage.
Fix expire field by setting it properly.
Change-Id: I2f8c454d63626876522c163eb8d3c5d1c8adfd51
Signed-off-by: Junjie Wu <junjiew@codeaurora.org>
| -rw-r--r-- | drivers/cpufreq/cpufreq_interactive.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/cpufreq/cpufreq_interactive.c b/drivers/cpufreq/cpufreq_interactive.c index 3635a1713b65..31151f0df5b1 100644 --- a/drivers/cpufreq/cpufreq_interactive.c +++ b/drivers/cpufreq/cpufreq_interactive.c @@ -210,6 +210,7 @@ static void cpufreq_interactive_timer_resched(unsigned long cpu, int i; spin_lock_irqsave(&ppol->load_lock, flags); + expires = round_to_nw_start(ppol->last_evaluated_jiffy, tunables); if (!slack_only) { for_each_cpu(i, ppol->policy->cpus) { pcpu = &per_cpu(cpuinfo, i); @@ -220,8 +221,6 @@ static void cpufreq_interactive_timer_resched(unsigned long cpu, pcpu->cputime_speedadj_timestamp = pcpu->time_in_idle_timestamp; } - expires = round_to_nw_start(ppol->last_evaluated_jiffy, - tunables); del_timer(&ppol->policy_timer); ppol->policy_timer.expires = expires; add_timer(&ppol->policy_timer); |