path: root/drivers/cpufreq/acpi-cpufreq.c
diff options
authorYinghai Lu <yinghai@kernel.org>2013-09-20 10:43:56 -0700
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-09-25 03:19:09 +0200
commit8a61e12e84597b5f8155ac91b44dea866ccfaac2 (patch)
treead5b14b1f1ad4acd0fc19e61ba34091d32ccc3b5 /drivers/cpufreq/acpi-cpufreq.c
parent4a10c2ac2f368583138b774ca41fac4207911983 (diff)
acpi-cpufreq: skip loading acpi_cpufreq after intel_pstate
If the hw supports intel_pstate and acpi_cpufreq, intel_pstate will get loaded first. acpi_cpufreq_init() will call acpi_cpufreq_early_init() and that will allocate perf data and init those perf data in ACPI core, (that will cover all CPUs). But later it will free them as cpufreq_register_driver(acpi_cpufreq) will fail as intel_pstate is already registered Use cpufreq_get_current_driver() to check if we can skip the acpi_cpufreq loading. Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/cpufreq/acpi-cpufreq.c')
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
index a1260b4549db..d2c3253e015e 100644
--- a/drivers/cpufreq/acpi-cpufreq.c
+++ b/drivers/cpufreq/acpi-cpufreq.c
@@ -986,6 +986,10 @@ static int __init acpi_cpufreq_init(void)
int ret;
+ /* don't keep reloading if cpufreq_driver exists */
+ if (cpufreq_get_current_driver())
+ return 0;
if (acpi_disabled)
return 0;