| commit | ee297533279a802eac8b1cbea8e65b24b36a1aac | [log] [tgz] |
|---|---|---|
| author | Yinghai Lu <yhlu.kernel@gmail.com> | Wed Sep 24 19:04:31 2008 -0700 |
| committer | Len Brown <len.brown@intel.com> | Fri Oct 10 23:45:38 2008 -0400 |
| tree | 7d461186acef980755b625f932560552dcd92751 | |
| parent | 3fa8749e584b55f1180411ab1b51117190bac1e5 [diff] [blame] |
ACPI: don't load acpi_cpufreq if acpi=off Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Len Brown <len.brown@intel.com>
diff --git a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c index dd097b8..9943b4c8 100644 --- a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +++ b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -779,6 +779,9 @@ { int ret; + if (acpi_disabled) + return 0; + dprintk("acpi_cpufreq_init\n"); ret = acpi_cpufreq_early_init();