The patch titled
Subject: watchdog, nmi: Fix compile issues on sparc
has been removed from the -mm tree. Its filename was
watchdog-control-hard-lockup-detection-default-fix-2.patch
This patch was dropped because it was folded into watchdog-control-hard-lockup-detection-default.patch
------------------------------------------------------
From: Don Zickus <dzickus@xxxxxxxxxx>
Subject: watchdog, nmi: Fix compile issues on sparc
Sparc doesn't use HARDLOCKUP_DETECTOR the same way x86 does. As a result break
out the new functions
watchdog_hardlockup_detector_is_enabled
watchdog_enable_hardlockup_detector
into their own #if defined area. This resolves the compile issue where
CONFIG_NMI_WATCHDOG=y and CONFIG_HARDLOCKUP_DETECTOR is not set on sparc.
Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx>
Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/nmi.h | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff -puN include/linux/nmi.h~watchdog-control-hard-lockup-detection-default-fix-2 include/linux/nmi.h
--- a/include/linux/nmi.h~watchdog-control-hard-lockup-detection-default-fix-2
+++ a/include/linux/nmi.h
@@ -17,13 +17,17 @@
#if defined(CONFIG_HAVE_NMI_WATCHDOG) || defined(CONFIG_HARDLOCKUP_DETECTOR)
#include <asm/nmi.h>
extern void touch_nmi_watchdog(void);
-extern void watchdog_enable_hardlockup_detector(bool val);
-extern bool watchdog_hardlockup_detector_is_enabled(void);
#else
static inline void touch_nmi_watchdog(void)
{
touch_softlockup_watchdog();
}
+#endif
+
+#if defined(CONFIG_HARDLOCKUP_DETECTOR)
+extern void watchdog_enable_hardlockup_detector(bool val);
+extern bool watchdog_hardlockup_detector_is_enabled(void);
+#else
static inline void watchdog_enable_hardlockup_detector(bool val)
{
}
_
Patches currently in -mm which might be from dzickus@xxxxxxxxxx are
origin.patch
watchdog-control-hard-lockup-detection-default.patch
kvm-ensure-hard-lockup-detection-is-disabled-by-default.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
