Merge branch 'x86/nmi' into x86/devel

[linux-2.6-omap-h63xx.git] / include / asm-x86 / nmi.h

diff --git a/include/asm-x86/nmi.h b/include/asm-x86/nmi.h
index 05449ef830a79f8526758d4c7ec5527529a7077f..f0e435dd38fbb247e2b6f62c4810738d23533147 100644 (file)
--- a/include/asm-x86/nmi.h
+++ b/include/asm-x86/nmi.h
@@ -17,12 +17,10 @@ int do_nmi_callback(struct pt_regs *regs, int cpu);
 
 #ifdef CONFIG_X86_64
 extern void default_do_nmi(struct pt_regs *);
-extern void die_nmi(char *str, struct pt_regs *regs, int do_panic);
-extern void nmi_watchdog_default(void);
-#else
-#define nmi_watchdog_default() do {} while (0)
 #endif
 
+extern void die_nmi(char *str, struct pt_regs *regs, int do_panic);
+extern void nmi_watchdog_default(void);
 extern int check_nmi_watchdog(void);
 extern int nmi_watchdog_enabled;
 extern int avail_to_resrv_perfctr_nmi_bit(unsigned int);