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 Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Nicholas Piggin <[email protected]> Reported-by: Santosh Sivaraj <[email protected]> Acked-by: Michael Ellerman <[email protected]> Cc: Don Zickus <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
0day-ci · Jul 10, 2017 · 1ba2ba8 · 1ba2ba8
1 parent b0570af
commit 1ba2ba8
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/arch/powerpc/kernel/watchdog.c b/arch/powerpc/kernel/watchdog.c
@@ -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);