diff --git a/[refs] b/[refs]
index 490856ddd419..6eda4a657441 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f59a9310b97879159ef4d25227bc270278f1ee71
+refs/heads/master: 2e4db9d2c5db9c9dd3e1d1ec3263bc4a990ff8df
diff --git a/trunk/include/asm-x86/nmi.h b/trunk/include/asm-x86/nmi.h
index 1e363021e72f..8455bf36d8df 100644
--- a/trunk/include/asm-x86/nmi.h
+++ b/trunk/include/asm-x86/nmi.h
@@ -46,7 +46,6 @@ extern void nmi_watchdog_default(void);
 
 extern int check_nmi_watchdog(void);
 extern int nmi_watchdog_enabled;
-extern int unknown_nmi_panic;
 extern int avail_to_resrv_perfctr_nmi_bit(unsigned int);
 extern int avail_to_resrv_perfctr_nmi(unsigned int);
 extern int reserve_perfctr_nmi(unsigned int);