From: Alexey Starikovskiy Date: Thu, 22 May 2008 21:54:44 +0000 (+0400) Subject: x86: Set pic_mode only if local apic code is present X-Git-Tag: v2.6.27-rc1~1106^2~247^2~73 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3e2416465bc9140bfd209f247e6a789f68f0d19;p=linux-2.6 x86: Set pic_mode only if local apic code is present --- diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c index 59f051db23..e61523a13e 100644 --- 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;