Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96a84c20 authored by Don Zickus's avatar Don Zickus Committed by Ingo Molnar
Browse files

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: default avatarDon Zickus <dzickus@redhat.com>
Reviewed-by: default avatarCyrill 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: default avatarIngo Molnar <mingo@elte.hu>
parent 2c6cb105

arch/x86/kernel/apic/hw_nmi.c

+7 −1
Original line number Diff line number Diff line
@@ -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;

include/linux/nmi.h

+3 −1
Original line number Diff line number Diff line
@@ -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