浏览代码

x86: Set pic_mode only if local apic code is present

Alexey Starikovskiy 17 年之前
父节点
当前提交
b3e2416465
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      arch/x86/kernel/mpparse.c

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