From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751893AbdF3IHy (ORCPT ); Fri, 30 Jun 2017 04:07:54 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:36360 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751699AbdF3IHw (ORCPT ); Fri, 30 Jun 2017 04:07:52 -0400 From: Nicholas Piggin To: Andrew Morton Cc: Nicholas Piggin , Don Zickus , santosiv@in.ibm.com, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH] powerpc/64s: watchdog false positive warning at CPU unplug Date: Fri, 30 Jun 2017 18:07:40 +1000 Message-Id: <20170630080740.20766-1-npiggin@gmail.com> X-Mailer: git-send-email 2.11.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Reported-by: Santosh Sivaraj Signed-off-by: Nicholas Piggin --- arch/powerpc/kernel/watchdog.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/kernel/watchdog.c b/arch/powerpc/kernel/watchdog.c index d46040c0da40..93395a53336b 100644 --- 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); -- 2.11.0