aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/smpboot.c
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@virtuousgeek.org>2008-04-21 17:14:44 -0400
committerIngo Molnar <mingo@elte.hu>2008-04-29 07:45:24 -0400
commite90955c26d8af318658c45caadb1d330ac6a506c (patch)
tree5b06f71bb27af8071767a18c7da3010478ec757b /arch/x86/kernel/smpboot.c
parent9752082560b440e6a45624569d26802e20d1b8b4 (diff)
x86: fix PCI MSI breaks when booting with nosmp
set up sane APIC state even in the nosmp case. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
-rw-r--r--arch/x86/kernel/smpboot.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 04c662ba18f1..84241a256dc8 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1149,14 +1149,10 @@ static int __init smp_sanity_check(unsigned max_cpus)
1149 "forcing use of dummy APIC emulation.\n"); 1149 "forcing use of dummy APIC emulation.\n");
1150 smpboot_clear_io_apic(); 1150 smpboot_clear_io_apic();
1151#ifdef CONFIG_X86_32 1151#ifdef CONFIG_X86_32
1152 if (nmi_watchdog == NMI_LOCAL_APIC) { 1152 connect_bsp_APIC();
1153 printk(KERN_INFO "activating minimal APIC for"
1154 "NMI watchdog use.\n");
1155 connect_bsp_APIC();
1156 setup_local_APIC();
1157 end_local_APIC_setup();
1158 }
1159#endif 1153#endif
1154 setup_local_APIC();
1155 end_local_APIC_setup();
1160 return -1; 1156 return -1;
1161 } 1157 }
1162 1158