diff --git a/[refs] b/[refs]
index dd9567624d3e..e6db6bc5ab8b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d54db1ac9ecde9bcb8a561595b02c1d970d3a4d6
+refs/heads/master: d788bada2f6c49673f85338ac4c0c642e5e52cff
diff --git a/trunk/include/asm-x86/mach-default/smpboot_hooks.h b/trunk/include/asm-x86/mach-default/smpboot_hooks.h
index 56d0e1fa0258..b63c52182006 100644
--- a/trunk/include/asm-x86/mach-default/smpboot_hooks.h
+++ b/trunk/include/asm-x86/mach-default/smpboot_hooks.h
@@ -41,8 +41,10 @@ static inline void __init smpboot_setup_io_apic(void)
 	 */
 	if (!skip_ioapic_setup && nr_ioapics)
 		setup_IO_APIC();
-	else
+	else {
 		nr_ioapics = 0;
+		localise_nmi_watchdog();
+	}
 }
 
 static inline void smpboot_clear_io_apic(void)