---

yaml --- r: 157110 b: refs/heads/master c: ce8442b h: refs/heads/master v: v3
git-mirror · Aug 27, 2009 · 4463136 · 4463136
1 parent 9f2bd49
commit 4463136
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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();