diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2008-07-08 12:17:08 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 12:17:08 +0200 |
| commit | 4b62ac9a2b859f932afd5625362c927111b7dd9b (patch) | |
| tree | 30b159e2a0ffa635488feae5587640a7c21372f3 /include/asm-x86/nmi.h | |
| parent | Merge branch 'x86/numa' into x86/devel (diff) | |
| parent | Merge branch 'linus' into x86/nmi (diff) | |
| download | linux-dev-4b62ac9a2b859f932afd5625362c927111b7dd9b.tar.xz linux-dev-4b62ac9a2b859f932afd5625362c927111b7dd9b.zip | |
Merge branch 'x86/nmi' into x86/devel
Conflicts:
arch/x86/kernel/nmi.c
arch/x86/kernel/nmi_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/nmi.h')
| -rw-r--r-- | include/asm-x86/nmi.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/asm-x86/nmi.h b/include/asm-x86/nmi.h index 05449ef830a7..f0e435dd38fb 100644 --- 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); |