From: Nicholas Piggin <npiggin@gmail.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Nicholas Piggin <npiggin@gmail.com>,
Don Zickus <dzickus@redhat.com>,
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 [thread overview]
Message-ID: <20170630080740.20766-1-npiggin@gmail.com> (raw)
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 <santosiv@in.ibm.com>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
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
next reply other threads:[~2017-06-30 8:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-30 8:07 Nicholas Piggin [this message]
2017-06-30 10:10 ` [PATCH] powerpc/64s: watchdog false positive warning at CPU unplug Michael Ellerman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170630080740.20766-1-npiggin@gmail.com \
--to=npiggin@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=dzickus@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=santosiv@in.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).