From: Nicholas Piggin Date: Sat, 5 May 2018 07:25:59 +0000 (+1000) Subject: powerpc/watchdog: don't update the watchdog timestamp if a lockup is detected X-Git-Tag: v5.15~8686^2~206 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5a951c4e7e8df5d6df52bace1b4ff327885584d6;p=platform%2Fkernel%2Flinux-starfive.git powerpc/watchdog: don't update the watchdog timestamp if a lockup is detected The watchdog heartbeat timestamp is updated when the local heartbeat timer fires (or touch_nmi_watchdog() is called). This is an interesting data point, so don't overwrite it when the soft-NMI interrupt detects a hard lockup. That code came from a pre- merge version to prevent hard lockup messages flood, but that's taken care of with the stuck CPU logic now, so there is no reason to update the heartbeat timestamp here. Signed-off-by: Nicholas Piggin Signed-off-by: Michael Ellerman --- diff --git a/arch/powerpc/kernel/watchdog.c b/arch/powerpc/kernel/watchdog.c index 591f7c3..b2d3bdf 100644 --- a/arch/powerpc/kernel/watchdog.c +++ b/arch/powerpc/kernel/watchdog.c @@ -245,8 +245,6 @@ void soft_nmi_interrupt(struct pt_regs *regs) tb = get_tb(); if (tb - per_cpu(wd_timer_tb, cpu) >= wd_panic_timeout_tb) { - per_cpu(wd_timer_tb, cpu) = tb; - wd_smp_lock(&flags); if (cpumask_test_cpu(cpu, &wd_smp_cpus_stuck)) { wd_smp_unlock(&flags);