Merge branch 'perf-watchdog-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / kernel / watchdog.c

diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 7b223b212683202e2e50ee83153eb8df7dbbe3de..ff7fd80bef994d07730ac87de9602dc750600934 100644 (file)
--- 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>
@@ -530,7 +525,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; }