The patch titled Subject: watchdog-provide-watchdog_reconfigure-for-arch-watchdogs-fix has been added to the -mm tree. Its filename is watchdog-provide-watchdog_reconfigure-for-arch-watchdogs-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/watchdog-provide-watchdog_reconfigure-for-arch-watchdogs-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/watchdog-provide-watchdog_reconfigure-for-arch-watchdogs-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Nicholas Piggin <npiggin@xxxxxxxxx> Subject: watchdog-provide-watchdog_reconfigure-for-arch-watchdogs-fix add code comments Link: http://lkml.kernel.org/r/20170617125933.774d3858@xxxxxxxxxxxxxxxxxxx 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> --- kernel/watchdog.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff -puN kernel/watchdog.c~watchdog-provide-watchdog_reconfigure-for-arch-watchdogs-fix kernel/watchdog.c --- a/kernel/watchdog.c~watchdog-provide-watchdog_reconfigure-for-arch-watchdogs-fix +++ a/kernel/watchdog.c @@ -114,6 +114,10 @@ int __read_mostly watchdog_suspended; /* * These functions can be overridden if an architecture implements its * own hardlockup detector. + * + * watchdog_nmi_enable/disable can be implemented to start and stop when + * softlockup watchdog threads start and stop. The arch must select the + * SOFTLOCKUP_DETECTOR Kconfig. */ int __weak watchdog_nmi_enable(unsigned int cpu) { @@ -123,6 +127,17 @@ void __weak watchdog_nmi_disable(unsigne { } +/* + * watchdog_nmi_reconfigure can be implemented to be notified after any + * watchdog configuration change. The arch hardlockup watchdog should + * respond to the following variables: + * - nmi_watchdog_enabled + * - watchdog_thresh + * - watchdog_cpumask + * - sysctl_hardlockup_all_cpu_backtrace + * - hardlockup_panic + * - watchdog_suspended + */ void __weak watchdog_nmi_reconfigure(void) { } _ 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 watchdog-provide-watchdog_reconfigure-for-arch-watchdogs-fix.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