Skip to contentSkip to conversation

powerpc/64s: watchdog false positive warning at CPU unplug

PATCH In review Nicholas Piggin 2 participants 2 messages Jun 30, 2017 PowerPC

lore
Share & tools
lore

Nicholas Piggin

author reviewer
#0 lore raw

PATCH 1/1 powerpc/64s: watchdog false positive warning at CPU unplug

CPU unplug will call stop_wd_on_cpu regardless if the watchdog has been configured to be enabled on that CPU. Don't warn in the case it's not in our enabled mask, this is a valid case.

Fixes powerpc-64s-implement-arch-specific-hardlockup-watchdog.patch
---
 arch/powerpc/kernel/watchdog.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
arch/powerpc/kernel/watchdog.c +2 -4
index d46040c0da40..93395a53336b 100644
@@ -310,10 +310,8 @@ static int start_wd_on_cpu(unsigned int cpu)
 
 static int stop_wd_on_cpu(unsigned int cpu)
 {
-	if (!cpumask_test_cpu(cpu, &wd_cpus_enabled)) {
-		WARN_ON(1);
-		return 0;
-	}
+	if (!cpumask_test_cpu(cpu, &wd_cpus_enabled))
+		return 0; /* Can happen in CPU unplug case */
 
 	stop_watchdog_timer_on(cpu);
 
Signature · 1 line
2.11.0
reviewer Acked-by on v1 1/1
#1 lore raw
Quoted 10 lines · Nicholas Piggin

CPU unplug will call stop_wd_on_cpu regardless if the watchdog has been configured to be enabled on that CPU. Don't warn in the case it's not in our enabled mask, this is a valid case.

Fixes powerpc-64s-implement-arch-specific-hardlockup-watchdog.patch
---
 arch/powerpc/kernel/watchdog.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

cheers