The patch titled
Make touch_nmi_watchdog imply touch_softlockup_watchdog on all archs
has been removed from the -mm tree. Its filename is
make-touch_nmi_watchdog-imply-touch_softlockup_watchdog-on.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: Make touch_nmi_watchdog imply touch_softlockup_watchdog on all archs
From: Michal Schmidt <xschmi00@xxxxxxxxxxxxxxxxxx>
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@xxxxxxxxxx: s390 fix]
Signed-off-by: Michal Schmidt <xschmi00@xxxxxxxxxxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxx>
Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Cc: Michal Schmidt <xschmi00@xxxxxxxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/asm-s390/irq.h | 3 ---
include/linux/nmi.h | 3 ++-
2 files changed, 2 insertions(+), 4 deletions(-)
diff -puN include/asm-s390/irq.h~make-touch_nmi_watchdog-imply-touch_softlockup_watchdog-on include/asm-s390/irq.h
--- a/include/asm-s390/irq.h~make-touch_nmi_watchdog-imply-touch_softlockup_watchdog-on
+++ 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
-
diff -puN include/linux/nmi.h~make-touch_nmi_watchdog-imply-touch_softlockup_watchdog-on include/linux/nmi.h
--- a/include/linux/nmi.h~make-touch_nmi_watchdog-imply-touch_softlockup_watchdog-on
+++ a/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
_
Patches currently in -mm which might be from xschmi00@xxxxxxxxxxxxxxxxxx are
origin.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
