diff options
| author | Don Zickus <dzickus@redhat.com> | 2010-11-29 17:07:16 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-12-10 00:01:06 +0100 |
| commit | 96a84c20d635fb1e98ab92f9fc517c4441f5c424 (patch) | |
| tree | 0bbc7fef23879f1f468e4521ca22bb0585a001ac | |
| parent | 2c6cb1053ad8b61ab9fb50b578d0ffea959f7583 (diff) | |
lockup detector: Compile fixes from removing the old x86 nmi watchdog
My patch that removed the old x86 nmi watchdog broke other
arches. This change reverts a piece of that patch and puts the
change in the correct spot.
Signed-off-by: Don Zickus <dzickus@redhat.com>
Reviewed-by: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: fweisbec@gmail.com
Cc: yinghai@kernel.org
LKML-Reference: <1291068437-5331-2-git-send-email-dzickus@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -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 057f1ebebe0..2e94eb49359 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 1c451e6ecc1..17ccf44e7dc 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 |