The patch titled
s390: remove s390 touch_nmi_watchdog() define
has been added to the -mm tree. Its filename is
make-touch_nmi_watchdog-imply-touch_softlockup_watchdog-on-fix.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: s390: remove s390 touch_nmi_watchdog() define
From: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
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@xxxxxxxxxx>
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Cc: Michal Schmidt <xschmi00@xxxxxxxxxxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
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
-
_
Patches currently in -mm which might be from heiko.carstens@xxxxxxxxxx are
origin.patch
ia64-kprobe-invalidate-icache-of-jump-buffer-s390-fix.patch
make-touch_nmi_watchdog-imply-touch_softlockup_watchdog-on-fix.patch
pi-futex-missing-pi_waiters-plist-initialization.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
