From 4463136926b7007ffc3448bb08b3a7d7d0e672e7 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Wed, 26 Aug 2009 14:29:26 -0700
Subject: [PATCH] --- yaml --- r: 157110 b: refs/heads/master c:
 ce8442b55135c679809311997d1446f3bbc05de2 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/acpi/processor_core.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f515deda52d3..3e71ae43168d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d288162f2afc42b37aab656f4622c076babbca3
+refs/heads/master: ce8442b55135c679809311997d1446f3bbc05de2
diff --git a/trunk/drivers/acpi/processor_core.c b/trunk/drivers/acpi/processor_core.c
index 84e0f3c07442..2cc4b3033872 100644
--- a/trunk/drivers/acpi/processor_core.c
+++ b/trunk/drivers/acpi/processor_core.c
@@ -1151,6 +1151,9 @@ static int __init acpi_processor_init(void)
 {
 	int result = 0;
 
+	if (acpi_disabled)
+		return 0;
+
 	memset(&errata, 0, sizeof(errata));
 
 #ifdef CONFIG_SMP
@@ -1197,6 +1200,9 @@ static int __init acpi_processor_init(void)
 
 static void __exit acpi_processor_exit(void)
 {
+	if (acpi_disabled)
+		return;
+
 	acpi_processor_ppc_exit();
 
 	acpi_thermal_cpufreq_exit();