commit b3e2416465bc9140bfd209f247e6a789f68f0d19
author Alexey Starikovskiy <astarikovskiy@suse.de> Fri May 23 01:54:44 2008 +0400
committer Thomas Gleixner <tglx@linutronix.de> Sun May 25 12:01:25 2008 +0200
tree 69abbdcfd2f9eec1d6dc2b816aa0bbfcd46e3f58
parent bf62f3981c7076714e3b9f5fa6989a806cad02bf

x86: Set pic_mode only if local apic code is present

arch/x86/kernel/mpparse.c

diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index 59f051d..e61523a 100644
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -609,7 +609,7 @@
 
 	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;