The patch titled
Subject: powerpc/64s: watchdog honor watchdog disable at boot/hotplug
has been removed from the -mm tree. Its filename was
powerpc-64s-implement-arch-specific-hardlockup-watchdog-fix.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 honor watchdog disable at boot/hotplug
The boot/hotplug paths were not taking into account if the
watchdog was disabled or suspended. Currently only the watchdog
reconfiguration path is.
Link: http://lkml.kernel.org/r/20170621001346.5bb337c9@xxxxxxxxxxxxxxxxxxx
Signed-off-by: Nicholas Piggin <npiggin@xxxxxxxxx>
Cc: Don Zickus <dzickus@xxxxxxxxxx>
Cc: Babu Moger <babu.moger@xxxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/powerpc/kernel/watchdog.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff -puN arch/powerpc/kernel/watchdog.c~powerpc-64s-implement-arch-specific-hardlockup-watchdog-fix arch/powerpc/kernel/watchdog.c
--- a/arch/powerpc/kernel/watchdog.c~powerpc-64s-implement-arch-specific-hardlockup-watchdog-fix
+++ a/arch/powerpc/kernel/watchdog.c
@@ -288,6 +288,12 @@ static int start_wd_on_cpu(unsigned int
return 0;
}
+ if (!(watchdog_enabled & NMI_WATCHDOG_ENABLED))
+ return 0;
+
+ if (watchdog_suspended)
+ return 0;
+
if (!cpumask_test_cpu(cpu, &watchdog_cpumask))
return 0;
@@ -337,12 +343,6 @@ void watchdog_nmi_reconfigure(void)
for_each_cpu(cpu, &wd_cpus_enabled)
stop_wd_on_cpu(cpu);
- if (!(watchdog_enabled & NMI_WATCHDOG_ENABLED))
- return;
-
- if (watchdog_suspended)
- return;
-
for_each_cpu_and(cpu, cpu_online_mask, &watchdog_cpumask)
start_wd_on_cpu(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
powerpc-64s-implement-arch-specific-hardlockup-watchdog-fix-2.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
