The patch titled
Make touch_nmi_watchdog imply touch_softlockup_watchdog on all archs
has been added to the -mm tree. Its filename is
make-touch_nmi_watchdog-imply-touch_softlockup_watchdog-on.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
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.
Signed-off-by: Michal Schmidt <xschmi00@xxxxxxxxxxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxx>
Acked-by: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/linux/nmi.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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
ide-touch-nmi-watchdog-during-resume-from-str.patch
make-touch_nmi_watchdog-imply-touch_softlockup_watchdog-on.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
