diff options
Diffstat (limited to 'include/linux/nmi.h')
-rw-r--r-- | include/linux/nmi.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/nmi.h b/include/linux/nmi.h index a42ff0bef708..794e7354c5bf 100644 --- a/include/linux/nmi.h +++ b/include/linux/nmi.h | |||
@@ -20,10 +20,14 @@ extern void touch_nmi_watchdog(void); | |||
20 | extern void acpi_nmi_disable(void); | 20 | extern void acpi_nmi_disable(void); |
21 | extern void acpi_nmi_enable(void); | 21 | extern void acpi_nmi_enable(void); |
22 | #else | 22 | #else |
23 | #ifndef CONFIG_NMI_WATCHDOG | ||
23 | static inline void touch_nmi_watchdog(void) | 24 | static inline void touch_nmi_watchdog(void) |
24 | { | 25 | { |
25 | touch_softlockup_watchdog(); | 26 | touch_softlockup_watchdog(); |
26 | } | 27 | } |
28 | #else | ||
29 | extern void touch_nmi_watchdog(void); | ||
30 | #endif | ||
27 | static inline void acpi_nmi_disable(void) { } | 31 | static inline void acpi_nmi_disable(void) { } |
28 | static inline void acpi_nmi_enable(void) { } | 32 | static inline void acpi_nmi_enable(void) { } |
29 | #endif | 33 | #endif |
@@ -49,6 +53,11 @@ static inline bool trigger_all_cpu_backtrace(void) | |||
49 | 53 | ||
50 | #ifdef CONFIG_NMI_WATCHDOG | 54 | #ifdef CONFIG_NMI_WATCHDOG |
51 | int hw_nmi_is_cpu_stuck(struct pt_regs *); | 55 | int hw_nmi_is_cpu_stuck(struct pt_regs *); |
56 | u64 hw_nmi_get_sample_period(void); | ||
57 | extern int nmi_watchdog_enabled; | ||
58 | struct ctl_table; | ||
59 | extern int proc_nmi_enabled(struct ctl_table *, int , | ||
60 | void __user *, size_t *, loff_t *); | ||
52 | #endif | 61 | #endif |
53 | 62 | ||
54 | #endif | 63 | #endif |