Message ID | 1406196811-5384-2-git-send-email-drjones@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
diff --git a/kernel/watchdog.c b/kernel/watchdog.c index c3319bd1b0408..c985a21926545 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -511,6 +511,9 @@ static void watchdog_nmi_disable(unsigned int cpu) /* should be in cleanup, but blocks oprofile */ perf_event_release_kernel(event); } + if (cpu == 0) + /* watchdog_nmi_enable() expects this to be zero initially. */ + cpu0_err = 0; return; } #else