diff options
author | Matthew Garrett <mjg@redhat.com> | 2011-07-13 17:58:32 -0400 |
---|---|---|
committer | Dave Jones <davej@redhat.com> | 2011-07-13 18:29:49 -0400 |
commit | 92e03c41a415e8e9e8009a1f5bbb9036f3bfb2f4 (patch) | |
tree | f6f723abb63d5ee3a0dc041a541bda5f51746525 /drivers/cpufreq | |
parent | 8d86e5f91440aa56a5df516bf58fe3883552ad56 (diff) | |
download | linux-stable-92e03c41a415e8e9e8009a1f5bbb9036f3bfb2f4.tar.gz linux-stable-92e03c41a415e8e9e8009a1f5bbb9036f3bfb2f4.tar.bz2 linux-stable-92e03c41a415e8e9e8009a1f5bbb9036f3bfb2f4.zip |
[CPUFREQ] Handle CPUs with different capabilities in acpi-cpufreq
acpi-cpufreq checks each CPU for aperf/mperf support, but only sets a
global flag. This will cause errors if some CPUs in the system don't
support the feature. Check boot_cpu_has() instead in order to make sure
that all CPUs support it.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'drivers/cpufreq')
-rw-r--r-- | drivers/cpufreq/acpi-cpufreq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c index 596d5dd32f41..56c6c6b4eb4d 100644 --- a/drivers/cpufreq/acpi-cpufreq.c +++ b/drivers/cpufreq/acpi-cpufreq.c @@ -655,7 +655,7 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) acpi_processor_notify_smm(THIS_MODULE); /* Check for APERF/MPERF support in hardware */ - if (cpu_has(c, X86_FEATURE_APERFMPERF)) + if (boot_cpu_has(X86_FEATURE_APERFMPERF)) acpi_cpufreq_driver.getavg = cpufreq_get_measured_perf; pr_debug("CPU%u - ACPI performance management activated.\n", cpu); |