diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-04-21 14:14:44 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-29 13:45:24 +0200 |
| commit | e90955c26d8af318658c45caadb1d330ac6a506c (patch) | |
| tree | 5b06f71bb27af8071767a18c7da3010478ec757b /arch/x86/kernel/smpboot.c | |
| parent | 9752082560b440e6a45624569d26802e20d1b8b4 (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.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 04c662ba18f..84241a256dc 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) "forcing use of dummy APIC emulation.\n"); smpboot_clear_io_apic(); #ifdef CONFIG_X86_32 - if (nmi_watchdog == NMI_LOCAL_APIC) { - printk(KERN_INFO "activating minimal APIC for" - "NMI watchdog use.\n"); - connect_bsp_APIC(); - setup_local_APIC(); - end_local_APIC_setup(); - } + connect_bsp_APIC(); #endif + setup_local_APIC(); + end_local_APIC_setup(); return -1; } |