From: Michal Schmidt <xschmi00@stud.feec.vutbr.cz>
Date: Fri, 29 Sep 2006 08:59:03 +0000 (-0700)
Subject: [PATCH] Make touch_nmi_watchdog imply touch_softlockup_watchdog on all archs
X-Git-Tag: v2.6.19-rc1~831
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9938406ab6b2558d60c0c7200cc8e12f1ea7104a;p=karo-tx-linux.git

[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>
---

diff --git a/include/asm-s390/irq.h b/include/asm-s390/irq.h
index bd1a721f7aa2..7da991a858f8 100644
--- a/include/asm-s390/irq.h
+++ b/include/asm-s390/irq.h
@@ -19,8 +19,5 @@ enum interruption_class {
 	NR_IRQS,
 };
 
-#define touch_nmi_watchdog() do { } while(0)
-
 #endif /* __KERNEL__ */
 #endif
-
diff --git a/include/linux/nmi.h b/include/linux/nmi.h
index c8f4d2f627d7..e16904e28c3a 100644
--- a/include/linux/nmi.h
+++ b/include/linux/nmi.h
@@ -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