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>

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)
                                  "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;
         }