[patch 48/56] ACPI: dont load acpi_cpufreq if acpi=off

Greg KH
2009-02-11T00:45:40Z

[-- Attachment #1: acpi-don-t-load-acpi_cpufreq-if-acpi-off.patch --]
[-- Type: text/plain, Size: 773 bytes --]

2.6.27-stable review patch. If anyone has any objections, please let us know.
------------------

From: Yinghai Lu <yhlu.kernel@gmail.com>

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>

---
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 3 +++
1 file changed, 3 insertions(+)

--- 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();