[GIT PULL] perf/watchdog changes for v3.18

[Ingo Molnar <mingo@kernel.org>]

Linus,

Please pull the latest perf-watchdog-for-linus git tree from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-watchdog-for-linus

   # HEAD: df577149594cefacd62740e86de080c6336d699e watchdog: Fix print-once on enable

Two small watchdog subsystem fixes.

 Thanks,

	Ingo

------------------>
Ulrich Obergfell (1):
      watchdog: Fix print-once on enable

chai wen (1):
      watchdog: Remove unnecessary header files


 kernel/watchdog.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index c3319bd1b040..df5494edf694 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -15,11 +15,6 @@
 #include <linux/cpu.h>
 #include <linux/nmi.h>
 #include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/freezer.h>
-#include <linux/kthread.h>
-#include <linux/lockdep.h>
-#include <linux/notifier.h>
 #include <linux/module.h>
 #include <linux/sysctl.h>
 #include <linux/smpboot.h>
@@ -511,7 +506,10 @@ static void watchdog_nmi_disable(unsigned int cpu)
 		/* should be in cleanup, but blocks oprofile */
 		perf_event_release_kernel(event);
 	}
-	return;
+	if (cpu == 0) {
+		/* watchdog_nmi_enable() expects this to be zero initially. */
+		cpu0_err = 0;
+	}
 }
 #else
 static int watchdog_nmi_enable(unsigned int cpu) { return 0; }