On Mon, Aug 18, 2014 at 11:07:57AM +0200, Ingo Molnar wrote: > > * Don Zickus <[email protected]> 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;'.
Doh, sorry about that. Thanks! Cheers, Don -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
