summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-09-24 19:04:31 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2009-02-12 09:31:15 -0800
commit599eeaa552681c0808c1099ad595437c3fbdc4ad (patch)
tree6fd3e0a91b896828ffa01de8f57d748ec54b96d8 /arch
parent034dee430be1c58d8d0d3d5edbfb045a1106bd1a (diff)
ACPI: don't load acpi_cpufreq if acpi=off
commit ee297533279a802eac8b1cbea8e65b24b36a1aac upstream. Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com> Signed-off-by: Thomas Renninger <trenn@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
index dd097b835839..9943b4c87746 100644
--- a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -779,6 +779,9 @@ static int __init acpi_cpufreq_init(void)
{
int ret;
+ if (acpi_disabled)
+ return 0;
+
dprintk("acpi_cpufreq_init\n");
ret = acpi_cpufreq_early_init();