kernel-watchdog-modify-the-explanation-related-to-watchdog-thread.patch removed from -mm tree
The patch titled
Subject: kernel: watchdog: modify the explanation related to watchdog thread
has been removed from the -mm tree. Its filename was
kernel-watchdog-modify-the-explanation-related-to-watchdog-thread.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Wang Qing <[email protected]>
Subject: kernel: watchdog: modify the explanation related to watchdog thread
The watchdog thread has been replaced by cpu_stop_work, modify the explanation related.
Signed-off-by Wang Qing <[email protected]>
Reviewed-by Petr Mladek <[email protected]>
Cc Jonathan Corbet <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>
Cc Joe Perches <[email protected]>
Cc Stephen Kitt <[email protected]>
Cc Kees Cook <[email protected]>
Cc Randy Dunlap <[email protected]>
Cc "Guilherme G. Piccoli" <[email protected]>
Cc Qais Yousef <[email protected]>
Cc Santosh Sivaraj <[email protected]>
Cc Vlastimil Babka <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
kernel/watchdog.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
kernel/watchdog.c renamed from kernel/watchdog.c~kernel-watchdog-modify-the-explanation-related-to-watchdog-thread +4 -8
@@ -92,7 +92,7 @@ __setup("nmi_watchdog=", hardlockup_pani* 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 watchdog start and stop. The arch must select the * SOFTLOCKUP_DETECTOR Kconfig. */ int __weak watchdog_nmi_enable (unsigned int cpu)
@@ -335,7 +335,7 @@ static DEFINE_PER_CPU(struct completion, static DEFINE_PER_CPU(struct cpu_stop_work, softlockup_stop_work);/* -* The watchdog thread function - touches the timestamp. +* The watchdog feed function - touches the timestamp. * * It only runs once every sample_period seconds (4 seconds by * default) to reset the softlockup timestamp. If this gets delayed
@@ -558,11 +558,7 @@ static void lockup_detector_reconfigure( }/* -* Create the watchdog thread infrastructure and configure the detector(s). -* -* The threads are not unparked as watchdog_allowed_mask is empty. When -* the threads are successfully initialized, take the proper locks and -* unpark the threads in the watchdog_cpumask if the watchdog is enabled. +* Create the watchdog infrastructure and configure the detector(s). */ static __init void lockup_detector_setup (void ) {
@@ -628,7 +624,7 @@ void lockup_detector_soft_poweroff(void)#ifdef CONFIG_SYSCTL -/* Propagate any changes to the watchdog threads */ +/* Propagate any changes to the watchdog infrastructure */ static void proc_watchdog_update (void ) {/* Remove impossible cpus to keep sysctl output clean. */
_
Patches currently in -mm which might be from [email protected] are