diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-06-13 23:33:17 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-06-13 23:33:17 +0200 |
| commit | bb4b9933e2bc0554cf4db37aa07b19ff69a85f8f (patch) | |
| tree | 92ec230e0292874d6a53ff33534e8637fa315479 /drivers/cpufreq/powernv-cpufreq.c | |
| parent | Linux 4.7-rc3 (diff) | |
| parent | cpufreq: governor: Drop gov_cancel_work() (diff) | |
| download | linux-bb4b9933e2bc0554cf4db37aa07b19ff69a85f8f.tar.xz linux-bb4b9933e2bc0554cf4db37aa07b19ff69a85f8f.zip | |
Merge back earlier cpufreq changes for v4.8.
Diffstat (limited to 'drivers/cpufreq/powernv-cpufreq.c')
| -rw-r--r-- | drivers/cpufreq/powernv-cpufreq.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/cpufreq/powernv-cpufreq.c b/drivers/cpufreq/powernv-cpufreq.c index 54c45368e3f1..b29c5c20c3a1 100644 --- a/drivers/cpufreq/powernv-cpufreq.c +++ b/drivers/cpufreq/powernv-cpufreq.c @@ -760,9 +760,8 @@ void powernv_cpufreq_work_fn(struct work_struct *work) struct cpufreq_policy policy; cpufreq_get_policy(&policy, cpu); - cpufreq_frequency_table_target(&policy, policy.freq_table, - policy.cur, - CPUFREQ_RELATION_C, &index); + index = cpufreq_frequency_table_target(&policy, policy.cur, + CPUFREQ_RELATION_C); powernv_cpufreq_target_index(&policy, index); cpumask_andnot(&mask, &mask, policy.cpus); } |