git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...
[pandora-kernel.git]
/
drivers
/
cpufreq
/
acpi-cpufreq.c
diff --git
a/drivers/cpufreq/acpi-cpufreq.c
b/drivers/cpufreq/acpi-cpufreq.c
index
596d5dd
..
56c6c6b
100644
(file)
--- 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 */
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);
acpi_cpufreq_driver.getavg = cpufreq_get_measured_perf;
pr_debug("CPU%u - ACPI performance management activated.\n", cpu);