From: Heiko Carstens <[email protected]>
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 <[email protected]>
Signed-off-by: Heiko Carstens <[email protected]>
---
include/asm-s390/irq.h | 3 ---
1 files changed, 3 deletions(-)
Index: linux-2.6.18-rc2-mm1/include/asm-s390/irq.h
===================================================================
--- linux-2.6.18-rc2-mm1.orig/include/asm-s390/irq.h 2006-07-27 13:25:11.000000000 +0200
+++ linux-2.6.18-rc2-mm1/include/asm-s390/irq.h 2006-07-27 13:34:53.000000000 +0200
@@ -19,8 +19,5 @@
NR_IRQS,
};
-#define touch_nmi_watchdog() do { } while(0)
-
#endif /* __KERNEL__ */
#endif
-
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
