[folded-merged] watchdog-move-nmi-function-header-declarations-from-watchdogh-to-nmih-v2.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: watchdog-move-nmi-function-header-declarations-from-watchdogh-to-nmih-v2
has been removed from the -mm tree.  Its filename was
     watchdog-move-nmi-function-header-declarations-from-watchdogh-to-nmih-v2.patch

This patch was dropped because it was folded into watchdog-move-nmi-function-header-declarations-from-watchdogh-to-nmih.patch

------------------------------------------------------
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

watchdog-move-nmi-function-header-declarations-from-watchdogh-to-nmih.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



[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux