diff options
| author | Alexey Starikovskiy | 2008-05-22 23:54:44 +0200 |
|---|---|---|
| committer | Thomas Gleixner | 2008-05-25 12:01:25 +0200 |
| commit | b3e2416465bc9140bfd209f247e6a789f68f0d19 (patch) | |
| tree | 69abbdcfd2f9eec1d6dc2b816aa0bbfcd46e3f58 /arch/x86/kernel/mpparse.c | |
| parent | x86: move e820_mark_nosave_regions to e820.c (diff) | |
| download | kernel-qcow2-linux-b3e2416465bc9140bfd209f247e6a789f68f0d19.tar.gz kernel-qcow2-linux-b3e2416465bc9140bfd209f247e6a789f68f0d19.tar.xz kernel-qcow2-linux-b3e2416465bc9140bfd209f247e6a789f68f0d19.zip | |
x86: Set pic_mode only if local apic code is present
Diffstat (limited to 'arch/x86/kernel/mpparse.c')
| -rw-r--r-- | arch/x86/kernel/mpparse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c index 59f051db236d..e61523a13ecd 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; |