diff --git a/[refs] b/[refs]
index 49d7f20b2920..4e64f523181a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6fe9fe875691e15eda61b992e03257e68aa5ba4f
+refs/heads/master: 148b50830993acc67129f09c544d9167291e5458
diff --git a/trunk/include/asm-x86/nmi.h b/trunk/include/asm-x86/nmi.h
index 1e363021e72f..745d8c847de5 100644
--- a/trunk/include/asm-x86/nmi.h
+++ b/trunk/include/asm-x86/nmi.h
@@ -78,6 +78,11 @@ extern int unknown_nmi_panic;
 void __trigger_all_cpu_backtrace(void);
 #define trigger_all_cpu_backtrace() __trigger_all_cpu_backtrace()
 
+static inline void localise_nmi_watchdog(void)
+{
+	if (nmi_watchdog == NMI_IO_APIC)
+		nmi_watchdog = NMI_LOCAL_APIC;
+}
 #endif
 
 void lapic_watchdog_stop(void);