* Don Zickus <dzickus@xxxxxxxxxx> wrote: > --- a/kernel/watchdog.c > +++ b/kernel/watchdog.c > @@ -522,6 +522,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; > } While at it I also removed the stray 'return;'. Thanks, Ingo -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html