On Tue, 1 Aug 2017 22:00:53 +1000 Nicholas Piggin <npig...@gmail.com> wrote:
> diff --git a/arch/powerpc/kernel/watchdog.c b/arch/powerpc/kernel/watchdog.c > index b67f8b03a32d..4b9a567c9975 100644 > --- a/arch/powerpc/kernel/watchdog.c > +++ b/arch/powerpc/kernel/watchdog.c > @@ -204,6 +204,9 @@ void soft_nmi_interrupt(struct pt_regs *regs) > return; > > nmi_enter(); > + > + __this_cpu_inc(irq_stat.soft_nmi_irqs); > + > tb = get_tb(); > if (tb - per_cpu(wd_timer_tb, cpu) >= wd_panic_timeout_tb) { > per_cpu(wd_timer_tb, cpu) = tb; Sorry, this hunk leaked into patch 3. Should be in patch 4.