* [PATCH] powerpc/64s: watchdog false positive warning at CPU unplug
@ 2017-06-30 8:07 Nicholas Piggin
2017-06-30 10:10 ` Michael Ellerman
0 siblings, 1 reply; 2+ messages in thread
From: Nicholas Piggin @ 2017-06-30 8:07 UTC (permalink / raw)
To: Andrew Morton
Cc: Nicholas Piggin, Don Zickus, santosiv, linuxppc-dev, linux-kernel
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] powerpc/64s: watchdog false positive warning at CPU unplug
2017-06-30 8:07 [PATCH] powerpc/64s: watchdog false positive warning at CPU unplug Nicholas Piggin
@ 2017-06-30 10:10 ` Michael Ellerman
0 siblings, 0 replies; 2+ messages in thread
From: Michael Ellerman @ 2017-06-30 10:10 UTC (permalink / raw)
To: Nicholas Piggin, Andrew Morton
Cc: Don Zickus, linuxppc-dev, santosiv, linux-kernel, Nicholas Piggin
Nicholas Piggin <npiggin@gmail.com> writes:
> 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(-)
Acked-by: Michael Ellerman <mpe@ellerman.id.au>
cheers
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-06-30 10:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-30 8:07 [PATCH] powerpc/64s: watchdog false positive warning at CPU unplug Nicholas Piggin
2017-06-30 10:10 ` Michael Ellerman
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).