1 files changed, 3 insertions, 0 deletions

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 8c53d86e3e86..f3760349c84f 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1159,6 +1159,9 @@ static int __init smp_sanity_check(unsigned max_cpus)
         if (!max_cpus) {
                 printk(KERN_INFO "SMP mode deactivated.\n");
                 smpboot_clear_io_apic();
+
+                localise_nmi_watchdog();
+
 #ifdef CONFIG_X86_32
                 connect_bsp_APIC();
 #endif