diff options
| -rw-r--r-- | arch/x86/kernel/apic/hw_nmi.c | 8 | ||||
| -rw-r--r-- | include/linux/nmi.h | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/arch/x86/kernel/apic/hw_nmi.c b/arch/x86/kernel/apic/hw_nmi.c index 057f1ebebe0c..2e94eb493591 100644 --- a/arch/x86/kernel/apic/hw_nmi.c +++ b/arch/x86/kernel/apic/hw_nmi.c @@ -24,8 +24,14 @@ u64 hw_nmi_get_sample_period(void) } #endif +#ifndef CONFIG_HARDLOCKUP_DETECTOR +void touch_nmi_watchdog(void) +{ + touch_softlockup_watchdog(); +} +EXPORT_SYMBOL(touch_nmi_watchdog); +#endif #ifdef arch_trigger_all_cpu_backtrace - /* For reliability, we're prepared to waste bits here. */ static DECLARE_BITMAP(backtrace_mask, NR_CPUS) __read_mostly; diff --git a/include/linux/nmi.h b/include/linux/nmi.h index 1c451e6ecc17..17ccf44e7dcb 100644 --- a/include/linux/nmi.h +++ b/include/linux/nmi.h @@ -16,7 +16,8 @@ */ #ifdef ARCH_HAS_NMI_WATCHDOG #include <asm/nmi.h> -#endif +extern void touch_nmi_watchdog(void); +#else #ifndef CONFIG_HARDLOCKUP_DETECTOR static inline void touch_nmi_watchdog(void) { @@ -25,6 +26,7 @@ static inline void touch_nmi_watchdog(void) #else extern void touch_nmi_watchdog(void); #endif +#endif /* * Create trigger_all_cpu_backtrace() out of the arch-provided |