The patch titled
Subject: kernel/watchdog: move NMI function header declarations from watchdog.h to nmi.h
has been removed from the -mm tree. Its filename was
watchdog-move-nmi-function-header-declarations-from-watchdogh-to-nmih.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Guenter Roeck <linux@xxxxxxxxxxxx>
Subject: kernel/watchdog: move NMI function header declarations from watchdog.h to nmi.h
The kernel's NMI watchdog has nothing to do with the watchdog subsystem.
Its header declarations should be in linux/nmi.h, not linux/watchdog.h.
The code provided two sets of dummy functions if HARDLOCKUP_DETECTOR is
not configured, one in the include file and one in kernel/watchdog.c.
Remove the dummy functions from kernel/watchdog.c and use those from the
include file.
Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Cc: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Don Zickus <dzickus@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86/kernel/cpu/perf_event_intel.c | 2 +-
include/linux/nmi.h | 8 +++++---
include/linux/watchdog.h | 8 --------
kernel/watchdog.c | 2 --
4 files changed, 6 insertions(+), 14 deletions(-)
diff -puN arch/x86/kernel/cpu/perf_event_intel.c~watchdog-move-nmi-function-header-declarations-from-watchdogh-to-nmih arch/x86/kernel/cpu/perf_event_intel.c
--- a/arch/x86/kernel/cpu/perf_event_intel.c~watchdog-move-nmi-function-header-declarations-from-watchdogh-to-nmih
+++ a/arch/x86/kernel/cpu/perf_event_intel.c
@@ -12,7 +12,7 @@
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/export.h>
-#include <linux/watchdog.h>
+#include <linux/nmi.h>
#include <asm/cpufeature.h>
#include <asm/hardirq.h>
diff -puN include/linux/nmi.h~watchdog-move-nmi-function-header-declarations-from-watchdogh-to-nmih include/linux/nmi.h
--- a/include/linux/nmi.h~watchdog-move-nmi-function-header-declarations-from-watchdogh-to-nmih
+++ a/include/linux/nmi.h
@@ -26,10 +26,12 @@ static inline void touch_nmi_watchdog(vo
#if defined(CONFIG_HARDLOCKUP_DETECTOR)
extern void hardlockup_detector_disable(void);
+void watchdog_nmi_disable_all(void);
+void watchdog_nmi_enable_all(void);
#else
-static inline void hardlockup_detector_disable(void)
-{
-}
+static inline void hardlockup_detector_disable(void) {}
+static inline void watchdog_nmi_disable_all(void) {}
+static inline void watchdog_nmi_enable_all(void) {}
#endif
/*
diff -puN include/linux/watchdog.h~watchdog-move-nmi-function-header-declarations-from-watchdogh-to-nmih include/linux/watchdog.h
--- a/include/linux/watchdog.h~watchdog-move-nmi-function-header-declarations-from-watchdogh-to-nmih
+++ a/include/linux/watchdog.h
@@ -140,12 +140,4 @@ extern int watchdog_init_timeout(struct
extern int watchdog_register_device(struct watchdog_device *);
extern void watchdog_unregister_device(struct watchdog_device *);
-#ifdef CONFIG_HARDLOCKUP_DETECTOR
-void watchdog_nmi_disable_all(void);
-void watchdog_nmi_enable_all(void);
-#else
-static inline void watchdog_nmi_disable_all(void) {}
-static inline void watchdog_nmi_enable_all(void) {}
-#endif
-
#endif /* ifndef _LINUX_WATCHDOG_H */
diff -puN kernel/watchdog.c~watchdog-move-nmi-function-header-declarations-from-watchdogh-to-nmih kernel/watchdog.c
--- a/kernel/watchdog.c~watchdog-move-nmi-function-header-declarations-from-watchdogh-to-nmih
+++ a/kernel/watchdog.c
@@ -651,8 +651,6 @@ unlock:
#else
static int watchdog_nmi_enable(unsigned int cpu) { return 0; }
static void watchdog_nmi_disable(unsigned int cpu) { return; }
-void watchdog_nmi_enable_all(void) {}
-void watchdog_nmi_disable_all(void) {}
#endif /* CONFIG_HARDLOCKUP_DETECTOR */
static struct smp_hotplug_thread watchdog_threads = {
_
Patches currently in -mm which might be from linux@xxxxxxxxxxxx are
dma-mapping-consolidate-dma_allocfree_attrscoherent-fix.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
