Revert "x86: APIC/SMP: downgrade the NMI watchdog for "nosmp""

This reverts commit 791b93d3dfaf16c23e978bec0cc0a3dd9d855d63.

A better fix from Maciej will be merged.

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index df60bc7c9cb706a806099cb08a1d66a70b95fc64..8c53d86e3e86d1d8e6dac6407db57a791264c56d 100644 (file)
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1159,10 +1159,6 @@ static int __init smp_sanity_check(unsigned max_cpus)
        if (!max_cpus) {
                printk(KERN_INFO "SMP mode deactivated.\n");
                smpboot_clear_io_apic();
-
-               if (nmi_watchdog != NMI_NONE && nmi_watchdog != NMI_DISABLED)
-                       nmi_watchdog = NMI_LOCAL_APIC;
-
 #ifdef CONFIG_X86_32
                connect_bsp_APIC();
 #endif