diff options
| author | Don Zickus <dzickus@redhat.com> | 2010-02-12 17:19:19 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-02-14 09:19:43 +0100 |
| commit | 504d7cf10ee42bb76b9556859f23d4121dee0a77 (patch) | |
| tree | edaa43a7c221f0926d150dbbeb38abc5fe0f1cc6 /include/linux/nmi.h | |
| parent | c3128fb6ad39b0edda6675d20585a64846cf89ea (diff) | |
| download | linux-3.10-504d7cf10ee42bb76b9556859f23d4121dee0a77.tar.gz linux-3.10-504d7cf10ee42bb76b9556859f23d4121dee0a77.tar.bz2 linux-3.10-504d7cf10ee42bb76b9556859f23d4121dee0a77.zip | |
nmi_watchdog: Compile and portability fixes
The original patch was x86_64 centric. Changed the code to make
it less so.
ested by building and running on a powerpc.
Signed-off-by: Don Zickus <dzickus@redhat.com>
Cc: peterz@infradead.org
Cc: gorcunov@gmail.com
Cc: aris@redhat.com
LKML-Reference: <1266013161-31197-2-git-send-email-dzickus@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 a42ff0bef70..794e7354c5b 100644 --- a/include/linux/nmi.h +++ b/include/linux/nmi.h @@ -20,10 +20,14 @@ extern void touch_nmi_watchdog(void); extern void acpi_nmi_disable(void); extern void acpi_nmi_enable(void); #else +#ifndef CONFIG_NMI_WATCHDOG static inline void touch_nmi_watchdog(void) { touch_softlockup_watchdog(); } +#else +extern void touch_nmi_watchdog(void); +#endif static inline void acpi_nmi_disable(void) { } static inline void acpi_nmi_enable(void) { } #endif @@ -49,6 +53,11 @@ static inline bool trigger_all_cpu_backtrace(void) #ifdef CONFIG_NMI_WATCHDOG int hw_nmi_is_cpu_stuck(struct pt_regs *); +u64 hw_nmi_get_sample_period(void); +extern int nmi_watchdog_enabled; +struct ctl_table; +extern int proc_nmi_enabled(struct ctl_table *, int , + void __user *, size_t *, loff_t *); #endif #endif |