The patch titled
s390: remove s390 touch_nmi_watchdog() define
has been removed from the -mm tree. Its filename is
make-touch_nmi_watchdog-imply-touch_softlockup_watchdog-on-fix.patch
This patch was dropped because it was folded into make-touch_nmi_watchdog-imply-touch_softlockup_watchdog-on.patch
------------------------------------------------------
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
convert-s390-page-handling-macros-to-functions.patch
make-touch_nmi_watchdog-imply-touch_softlockup_watchdog-on.patch
make-touch_nmi_watchdog-imply-touch_softlockup_watchdog-on-fix.patch
simplify-update_times-avoid-jiffies-jiffies_64-aliasing-problem-2.patch
kill-wall_jiffies.patch
introduce-kernel_execve.patch
rename-the-provided-execve-functions-to-kernel_execve.patch
provide-kernel_execve-on-all-architectures.patch
provide-kernel_execve-on-all-architectures-fix.patch
remove-the-use-of-_syscallx-macros-in-uml.patch
sh64-remove-the-use-of-kernel-syscalls.patch
remove-remaining-errno-and-__kernel_syscalls__-references.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
