1 files changed, 4 insertions, 1 deletions

diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 4c2e11ce5425..df5494edf694 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -506,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; }