aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAlexey Starikovskiy <astarikovskiy@suse.de>2008-05-23 01:54:44 +0400
committerThomas Gleixner <tglx@linutronix.de>2008-05-25 12:01:25 +0200
commitb3e2416465bc9140bfd209f247e6a789f68f0d19 (patch)
tree69abbdcfd2f9eec1d6dc2b816aa0bbfcd46e3f58 /arch
parentbf62f3981c7076714e3b9f5fa6989a806cad02bf (diff)
downloadkernel_samsung_tuna-b3e2416465bc9140bfd209f247e6a789f68f0d19.zip
kernel_samsung_tuna-b3e2416465bc9140bfd209f247e6a789f68f0d19.tar.gz
kernel_samsung_tuna-b3e2416465bc9140bfd209f247e6a789f68f0d19.tar.bz2
x86: Set pic_mode only if local apic code is present
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/mpparse.c2
1 files changed, 1 insertions, 1 deletions
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 @@ 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;