aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-09-24 22:04:31 -0400
committerLen Brown <len.brown@intel.com>2008-10-10 23:45:38 -0400
commitee297533279a802eac8b1cbea8e65b24b36a1aac (patch)
tree7d461186acef980755b625f932560552dcd92751 /arch/x86
parent3fa8749e584b55f1180411ab1b51117190bac1e5 (diff)
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>
Diffstat (limited to 'arch/x86')
-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)
779{ 779{
780 int ret; 780 int ret;
781 781
782 if (acpi_disabled)
783 return 0;
784
782 dprintk("acpi_cpufreq_init\n"); 785 dprintk("acpi_cpufreq_init\n");
783 786
784 ret = acpi_cpufreq_early_init(); 787 ret = acpi_cpufreq_early_init();