ACPI: don't load acpi_cpufreq if acpi=off
authorYinghai Lu <yhlu.kernel@gmail.com>
Thu, 25 Sep 2008 02:04:31 +0000 (19:04 -0700)
committerLen Brown <len.brown@intel.com>
Sat, 11 Oct 2008 03:45:38 +0000 (23:45 -0400)
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Len Brown <len.brown@intel.com>
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c

index dd097b835839dd73d4139d807c23e8fca1648344..9943b4c8774609e2af1ff4f4b9e8374e22a8937b 100644 (file)
@@ -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();