---

yaml --- r: 99883 b: refs/heads/master c: 3eb11ed h: refs/heads/master i: 99881: e77b2eb 99879: df7e7d3 v: v3
git-mirror · Jul 8, 2008 · 0181d3f · 0181d3f
1 parent f3402f9
commit 0181d3f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 346cafecdeb17e1a0457a9e7eca239ef467b678c
+refs/heads/master: 3eb11edc1321e14a121deeb8b18c177750226eca
diff --git a/trunk/arch/x86/kernel/setup_32.c b/trunk/arch/x86/kernel/setup_32.c
@@ -406,7 +406,9 @@ void __init setup_arch(char **cmdline_p)
 	parse_early_param();
 
 	if (acpi_mps_check()){
+#ifdef CONFIG_X86_LOCAL_APIC
 		enable_local_apic = -1;
+#endif
 		clear_cpu_cap(&boot_cpu_data, X86_FEATURE_APIC);
 	}