Commit 9938406a authored Sep 29, 2006 by Michal Schmidt Committed by Linus Torvalds Sep 29, 2006

[PATCH] Make touch_nmi_watchdog imply touch_softlockup_watchdog on all archs



touch_nmi_watchdog() calls touch_softlockup_watchdog() on both
architectures that implement it (i386 and x86_64).  On other architectures
it does nothing at all.  touch_nmi_watchdog() should imply
touch_softlockup_watchdog() on all architectures.  Suggested by Andi Kleen.

[heiko.carstens@de.ibm.com: s390 fix]
Signed-off-by: Michal Schmidt <xschmi00@stud.feec.vutbr.cz>
Cc: Andi Kleen <ak@muc.de>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Michal Schmidt <xschmi00@stud.feec.vutbr.cz>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent df89a864

include/asm-s390/irq.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -19,8 +19,5 @@ enum interruption_class {
		NR_IRQS,
		};

		#define touch_nmi_watchdog() do { } while(0)

		#endif /* __KERNEL__ */
		#endif

include/linux/nmi.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@
		#ifndef LINUX_NMI_H
		#define LINUX_NMI_H

		#include <linux/sched.h>
		#include <asm/irq.h>

		/**
		@@ -16,7 +17,7 @@
		#ifdef ARCH_HAS_NMI_WATCHDOG
		extern void touch_nmi_watchdog(void);
		#else
		# define touch_nmi_watchdog() do { } while(0)
		# define touch_nmi_watchdog() touch_softlockup_watchdog()
		#endif

		#endif