From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yinghai Lu Subject: [PATCH 1/7] acpi: don't load acpi_cpufreq if acpi=off Date: Wed, 24 Sep 2008 19:04:31 -0700 Message-ID: <1222308277-10984-1-git-send-email-yhlu.kernel@gmail.com> Return-path: Sender: linux-pci-owner@vger.kernel.org To: Jesse Barnes , Len Brown , Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" , Andrew Cc: linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org, Yinghai Lu List-Id: linux-acpi@vger.kernel.org Signed-off-by: Yinghai Lu --- arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 3 +++ 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 dd097b8..9943b4c 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(); -- 1.5.6