diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-06 12:24:05 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-06 12:24:05 +1100 |
| commit | be3436e2823da41f2cc22bb3b7cd787e7d9c5b9b (patch) | |
| tree | d22fd4fde83843e4ae34cdf39f70d925c952fa6a /include | |
| parent | b24dd939e5911634ade159d70c524bdfa6076272 (diff) | |
Revert "x86, nmi_watchdog: Remove the old nmi_watchdog"
This reverts commit 5f2b0ba4d94b3ac23cbc4b7f675d98eb677a760a.
Conflicts:
arch/x86/kernel/apic/hw_nmi.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/nmi.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/nmi.h b/include/linux/nmi.h index 0cb3e5c246d0..06aab5eee134 100644 --- a/include/linux/nmi.h +++ b/include/linux/nmi.h @@ -16,7 +16,10 @@ */ #ifdef ARCH_HAS_NMI_WATCHDOG #include <asm/nmi.h> -#endif +extern void touch_nmi_watchdog(void); +extern void acpi_nmi_disable(void); +extern void acpi_nmi_enable(void); +#else #ifndef CONFIG_HARDLOCKUP_DETECTOR static inline void touch_nmi_watchdog(void) { @@ -27,6 +30,7 @@ extern void touch_nmi_watchdog(void); #endif static inline void acpi_nmi_disable(void) { } static inline void acpi_nmi_enable(void) { } +#endif /* * Create trigger_all_cpu_backtrace() out of the arch-provided |