The patch titled
Subject: kernel/watchdog: move NMI function header declarations from watchdog.h to nmi.h
has been added to the -mm tree. Its filename is
watchdog-move-nmi-function-header-declarations-from-watchdogh-to-nmih.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/watchdog-move-nmi-function-header-declarations-from-watchdogh-to-nmih.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/watchdog-move-nmi-function-header-declarations-from-watchdogh-to-nmih.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
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.
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 --------
3 files changed, 6 insertions(+), 12 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 */
_
Patches currently in -mm which might be from linux@xxxxxxxxxxxx are
iommu-common-do-not-use-64-bit-constant-0xffffffffffffffffl-for-computing-align_mask.patch
watchdog-move-nmi-function-header-declarations-from-watchdogh-to-nmih.patch
mm-mlock-add-new-mlock-munlock-and-munlockall-system-calls-v4.patch
linux-next.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
