From: Heiko Carstens <heiko.carstens@de.ibm.com>

Remove s390 touch_nmi_watchdog() define to avoid compile warnings.

touch_nmi_watchdog() got converted to touch_softlockup_watchdog() which in
case of !CONFIG_DETECT_SOFTLOCKUP is also a nop, just like we want it on
s390.

In file included from kernel/sched.c:23:
include/linux/nmi.h:20:1: warning: "touch_nmi_watchdog" redefined
In file included from include/linux/nmi.h:8,
                 from kernel/sched.c:23:
include/asm/irq.h:22:1: warning: this is the location of the previous definition

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: Andi Kleen <ak@muc.de>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/asm-s390/irq.h |    3 ---
 1 file changed, 3 deletions(-)

diff -puN include/asm-s390/irq.h~make-touch_nmi_watchdog-imply-touch_softlockup_watchdog-on-fix include/asm-s390/irq.h
--- a/include/asm-s390/irq.h~make-touch_nmi_watchdog-imply-touch_softlockup_watchdog-on-fix
+++ a/include/asm-s390/irq.h
@@ -19,8 +19,5 @@ enum interruption_class {
 	NR_IRQS,
 };
 
-#define touch_nmi_watchdog() do { } while(0)
-
 #endif /* __KERNEL__ */
 #endif
-
_