The patch titled
Subject: watchdog-move-nmi-function-header-declarations-from-watchdogh-to-nmih-v2
has been added to the -mm tree. Its filename is
watchdog-move-nmi-function-header-declarations-from-watchdogh-to-nmih-v2.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/watchdog-move-nmi-function-header-declarations-from-watchdogh-to-nmih-v2.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/watchdog-move-nmi-function-header-declarations-from-watchdogh-to-nmih-v2.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: watchdog-move-nmi-function-header-declarations-from-watchdogh-to-nmih-v2
v2: Remove duplicate dummy functions from kernel/watchdog.c.
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>
---
kernel/watchdog.c | 2 --
1 file changed, 2 deletions(-)
diff -puN kernel/watchdog.c~watchdog-move-nmi-function-header-declarations-from-watchdogh-to-nmih-v2 kernel/watchdog.c
--- a/kernel/watchdog.c~watchdog-move-nmi-function-header-declarations-from-watchdogh-to-nmih-v2
+++ 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
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
watchdog-move-nmi-function-header-declarations-from-watchdogh-to-nmih-v2.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
