The patch titled
Subject: powerpc/64s: watchdog false positive warning at CPU unplug
has been removed from the -mm tree. Its filename was
powerpc-64s-implement-arch-specific-hardlockup-watchdog-fix-2.patch
This patch was dropped because it was folded into powerpc-64s-implement-arch-specific-hardlockup-watchdog.patch
------------------------------------------------------
From: Nicholas Piggin <npiggin@xxxxxxxxx>
Subject: 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/20170630080740.20766-1-npiggin@xxxxxxxxx
Signed-off-by: Nicholas Piggin <npiggin@xxxxxxxxx>
Reported-by: Santosh Sivaraj <santosiv@xxxxxxxxxx>
Acked-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
Cc: Don Zickus <dzickus@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/powerpc/kernel/watchdog.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff -puN arch/powerpc/kernel/watchdog.c~powerpc-64s-implement-arch-specific-hardlockup-watchdog-fix-2 arch/powerpc/kernel/watchdog.c
--- a/arch/powerpc/kernel/watchdog.c~powerpc-64s-implement-arch-specific-hardlockup-watchdog-fix-2
+++ a/arch/powerpc/kernel/watchdog.c
@@ -310,10 +310,8 @@ static int start_wd_on_cpu(unsigned int
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);
_
Patches currently in -mm which might be from npiggin@xxxxxxxxx are
watchdog-remove-unused-declaration.patch
watchdog-introduce-arch_touch_nmi_watchdog.patch
watchdog-split-up-config-options.patch
watchdog-provide-watchdog_reconfigure-for-arch-watchdogs.patch
powerpc-64s-implement-arch-specific-hardlockup-watchdog.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
