diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-30 14:39:02 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-30 14:39:02 -0400 |
| commit | 31271e9aacaa3c3460cbad8ec62fb5a04a522f5b (patch) | |
| tree | 815c671dac14e0e07959dc88e94c36a994f9c460 /drivers/cpufreq/powernow-k8.c | |
| parent | 32111abb508424d1d110fa471d940160abe251f5 (diff) | |
| parent | dc4dc36056392c0b0b1ca9e81bebff964b9297e0 (diff) | |
Merge branch 'spi-tegra' into spi-next
Diffstat (limited to 'drivers/cpufreq/powernow-k8.c')
| -rw-r--r-- | drivers/cpufreq/powernow-k8.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/cpufreq/powernow-k8.c b/drivers/cpufreq/powernow-k8.c index 129e80bfff22..c16a3a593ba4 100644 --- a/drivers/cpufreq/powernow-k8.c +++ b/drivers/cpufreq/powernow-k8.c | |||
| @@ -1052,14 +1052,7 @@ static int powernowk8_target(struct cpufreq_policy *pol, | |||
| 1052 | struct powernowk8_target_arg pta = { .pol = pol, .targfreq = targfreq, | 1052 | struct powernowk8_target_arg pta = { .pol = pol, .targfreq = targfreq, |
| 1053 | .relation = relation }; | 1053 | .relation = relation }; |
| 1054 | 1054 | ||
| 1055 | /* | 1055 | return work_on_cpu(pol->cpu, powernowk8_target_fn, &pta); |
| 1056 | * Must run on @pol->cpu. cpufreq core is responsible for ensuring | ||
| 1057 | * that we're bound to the current CPU and pol->cpu stays online. | ||
| 1058 | */ | ||
| 1059 | if (smp_processor_id() == pol->cpu) | ||
| 1060 | return powernowk8_target_fn(&pta); | ||
| 1061 | else | ||
| 1062 | return work_on_cpu(pol->cpu, powernowk8_target_fn, &pta); | ||
| 1063 | } | 1056 | } |
| 1064 | 1057 | ||
| 1065 | /* Driver entry point to verify the policy and range of frequencies */ | 1058 | /* Driver entry point to verify the policy and range of frequencies */ |