]> err.no Git - linux-2.6/commitdiff
x86: Set pic_mode only if local apic code is present
authorAlexey Starikovskiy <astarikovskiy@suse.de>
Thu, 22 May 2008 21:54:44 +0000 (01:54 +0400)
committerThomas Gleixner <tglx@linutronix.de>
Sun, 25 May 2008 10:01:25 +0000 (12:01 +0200)
arch/x86/kernel/mpparse.c

index 59f051db236d1eebeb13a6f15529efc6abbac5e2..e61523a13ecd24bbe75bc87db002cab76c1a20b1 100644 (file)
@@ -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;