diff options
Diffstat (limited to 'include/asm-x86/nmi.h')
-rw-r--r-- | include/asm-x86/nmi.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/include/asm-x86/nmi.h b/include/asm-x86/nmi.h index 21f8d0202a82..a53f829a97c5 100644 --- a/include/asm-x86/nmi.h +++ b/include/asm-x86/nmi.h | |||
@@ -1,5 +1,5 @@ | |||
1 | #ifndef _ASM_X86_NMI_H_ | 1 | #ifndef ASM_X86__NMI_H |
2 | #define _ASM_X86_NMI_H_ | 2 | #define ASM_X86__NMI_H |
3 | 3 | ||
4 | #include <linux/pm.h> | 4 | #include <linux/pm.h> |
5 | #include <asm/irq.h> | 5 | #include <asm/irq.h> |
@@ -15,10 +15,6 @@ | |||
15 | */ | 15 | */ |
16 | int do_nmi_callback(struct pt_regs *regs, int cpu); | 16 | int do_nmi_callback(struct pt_regs *regs, int cpu); |
17 | 17 | ||
18 | #ifdef CONFIG_X86_64 | ||
19 | extern void default_do_nmi(struct pt_regs *); | ||
20 | #endif | ||
21 | |||
22 | extern void die_nmi(char *str, struct pt_regs *regs, int do_panic); | 18 | extern void die_nmi(char *str, struct pt_regs *regs, int do_panic); |
23 | extern int check_nmi_watchdog(void); | 19 | extern int check_nmi_watchdog(void); |
24 | extern int nmi_watchdog_enabled; | 20 | extern int nmi_watchdog_enabled; |
@@ -34,6 +30,7 @@ extern void stop_apic_nmi_watchdog(void *); | |||
34 | extern void disable_timer_nmi_watchdog(void); | 30 | extern void disable_timer_nmi_watchdog(void); |
35 | extern void enable_timer_nmi_watchdog(void); | 31 | extern void enable_timer_nmi_watchdog(void); |
36 | extern int nmi_watchdog_tick(struct pt_regs *regs, unsigned reason); | 32 | extern int nmi_watchdog_tick(struct pt_regs *regs, unsigned reason); |
33 | extern void cpu_nmi_set_wd_enabled(void); | ||
37 | 34 | ||
38 | extern atomic_t nmi_active; | 35 | extern atomic_t nmi_active; |
39 | extern unsigned int nmi_watchdog; | 36 | extern unsigned int nmi_watchdog; |
@@ -81,4 +78,4 @@ void enable_lapic_nmi_watchdog(void); | |||
81 | void stop_nmi(void); | 78 | void stop_nmi(void); |
82 | void restart_nmi(void); | 79 | void restart_nmi(void); |
83 | 80 | ||
84 | #endif | 81 | #endif /* ASM_X86__NMI_H */ |