Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

kernel: watchdog: modify the explanation related to watchdog thread

The watchdog thread has been replaced by cpu_stop_work, modify the
explanation related.

Link: https://lkml.kernel.org/r/1619687073-24686-2-git-send-email-wangqing@vivo.com
Signed-off-by: Wang Qing <wangqing@vivo.com>
Reviewed-by: Petr Mladek <pmladek@suse.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Cc: Joe Perches <joe@perches.com>
Cc: Stephen Kitt <steve@sk2.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: "Guilherme G. Piccoli" <gpiccoli@canonical.com>
Cc: Qais Yousef <qais.yousef@arm.com>
Cc: Santosh Sivaraj <santosh@fossix.org>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Wang Qing and committed by
Linus Torvalds
b124ac45 7ed6d4e4

+4 -8
+4 -8
kernel/watchdog.c
··· 92 92 * own hardlockup detector. 93 93 * 94 94 * watchdog_nmi_enable/disable can be implemented to start and stop when 95 - * softlockup watchdog threads start and stop. The arch must select the 95 + * softlockup watchdog start and stop. The arch must select the 96 96 * SOFTLOCKUP_DETECTOR Kconfig. 97 97 */ 98 98 int __weak watchdog_nmi_enable(unsigned int cpu) ··· 335 335 static DEFINE_PER_CPU(struct cpu_stop_work, softlockup_stop_work); 336 336 337 337 /* 338 - * The watchdog thread function - touches the timestamp. 338 + * The watchdog feed function - touches the timestamp. 339 339 * 340 340 * It only runs once every sample_period seconds (4 seconds by 341 341 * default) to reset the softlockup timestamp. If this gets delayed ··· 558 558 } 559 559 560 560 /* 561 - * Create the watchdog thread infrastructure and configure the detector(s). 562 - * 563 - * The threads are not unparked as watchdog_allowed_mask is empty. When 564 - * the threads are successfully initialized, take the proper locks and 565 - * unpark the threads in the watchdog_cpumask if the watchdog is enabled. 561 + * Create the watchdog infrastructure and configure the detector(s). 566 562 */ 567 563 static __init void lockup_detector_setup(void) 568 564 { ··· 624 628 625 629 #ifdef CONFIG_SYSCTL 626 630 627 - /* Propagate any changes to the watchdog threads */ 631 + /* Propagate any changes to the watchdog infrastructure */ 628 632 static void proc_watchdog_update(void) 629 633 { 630 634 /* Remove impossible cpus to keep sysctl output clean. */