x86: Set pic_mode only if local apic code is present

b3e24164 · Alexey Starikovskiy · Thomas Gleixner · bf62f398 · b3e24164
Commit b3e24164 authored May 23, 2008 by Alexey Starikovskiy Committed by Thomas Gleixner May 25, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

arch/x86/kernel/mpparse.c arch/x86/kernel/mpparse.c +1 -1

No files found.
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -609,7 +609,7 @@ static void __init __get_smp_config(unsigned early)

 	printk(KERN_INFO "Intel MultiProcessor Specification v1.%d\n",
 	       mpf->mpf_specification);
-#ifdef CONFIG_X86_32
+#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86_32)
 	if (mpf->mpf_feature2 & (1 << 7)) {
 		printk(KERN_INFO "    IMCR and PIC compatibility mode.\n");
 		pic_mode = 1;