From: Yinghai Lu <yhlu.kernel@gmail.com>
Date: Thu, 25 Sep 2008 02:04:31 +0000 (-0700)
Subject: ACPI: don't load acpi_cpufreq if acpi=off
X-Git-Tag: v2.6.27.16~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=599eeaa552681c0808c1099ad595437c3fbdc4ad;p=thirdparty%2Fkernel%2Fstable.git

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>
---

diff --git a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
index dd097b835839d..9943b4c877460 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();