Received: by 2002:a05:6a10:a841:0:0:0:0 with SMTP id d1csp1213978pxy; Thu, 29 Apr 2021 02:06:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy8+IBxaIi6U191K5X46NIBPdB0gugYencxJY9+jxANyYtqsUvgCuZ4XmGkptbuLay/YgLV X-Received: by 2002:a05:6402:1587:: with SMTP id c7mr10059435edv.181.1619687188547; Thu, 29 Apr 2021 02:06:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619687188; cv=none; d=google.com; s=arc-20160816; b=h2muP60HEv8g14lmoEwlmP0f/mLTlVa/73rqnGXYjgFKCNl4vN1BrJcK6n8VZzcrWw o+NLra1OGdumFcAAkucd8ZwC3LNTpAUNrmGUJG/az5o++wwIa1skfHgCyjvpKBmwm79s q0ODnqO8uyvNXa4PvxKxOo/0FNmudyZvu74MtSVjIOYIbcY+hH+BYQao9yAU8iRmZbo2 yhhw8f1DNXQc0kLVfrJVzY16hpUAoCscJSqYG3FMJ6gLwrQb/n2YlCGszNgPJ908RApj 8I7LUVAsbZVoDgSdHjQLeiHNh0/5AfKKuMpp+MhlfqDKXfsvk2GcEWOAtr+mFoCyH58N ctag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:to:from; bh=l+1LtcA6obWNTMQ8TvgowUULnPopg4BIQOnAb+I4SCE=; b=z4Uf6n3iBD67/LX8PX/Vrqyin5n700PN89fxdWzusRnRg1d7kC15BvskO9QqJHyxUN TZk5UNiPO2XKmMwBdegEGViFl8S28taG2lEQmf+fBs1YNQLk/BF8WwjekxDBzL85YVNN +7QdKN13FS+3ylB7vWjr5rH7UF7B8sBL7MzAML9pJJcOdK9okWHL3iFuECfJSG4CWFiB lwqcG/tG+YYaRtOg+Wx3sKRcqha1Zs8iq45mEfiEEilfj2b3a3BYw0MXBbdNR+82dyD5 VB6adbEP46mNU28QDhNhPeF7DXJJn46d2HzFKGiqpfYerBbwIAmnUgdOnt8EsMywDuKH 7jTg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=vivo.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id o16si2292915edc.1.2021.04.29.02.06.05; Thu, 29 Apr 2021 02:06:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=vivo.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240183AbhD2JFi (ORCPT + 99 others); Thu, 29 Apr 2021 05:05:38 -0400 Received: from mail-m17655.qiye.163.com ([59.111.176.55]:63808 "EHLO mail-m17655.qiye.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240008AbhD2JFg (ORCPT ); Thu, 29 Apr 2021 05:05:36 -0400 Received: from vivo-HP-ProDesk-680-G4-PCI-MT.vivo.xyz (unknown [58.250.176.229]) by mail-m17655.qiye.163.com (Hmail) with ESMTPA id 0A578400B3; Thu, 29 Apr 2021 17:04:47 +0800 (CST) From: Wang Qing To: Jonathan Corbet , Wang Qing , Mauro Carvalho Chehab , Joe Perches , Stephen Kitt , Andrew Morton , Kees Cook , Randy Dunlap , "Guilherme G. Piccoli" , Qais Yousef , Petr Mladek , Santosh Sivaraj , Vlastimil Babka , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V2,RESEND 1/4] kernel: watchdog: Modify the explanation related to watchdog thread Date: Thu, 29 Apr 2021 17:04:25 +0800 Message-Id: <1619687073-24686-2-git-send-email-wangqing@vivo.com> X-Mailer: git-send-email 2.7.4 X-HM-Spam-Status: e1kfGhgUHx5ZQUtXWQgYFAkeWUFZS1VLWVdZKFlBSE83V1ktWUFJV1kPCR oVCBIfWUFZQhgYT1YfTUgfQhlKS04eHR1VEwETFhoSFyQUDg9ZV1kWGg8SFR0UWUFZT0tIVUpKS0 hKTFVLWQY+ X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6Ni46Ijo5Hj8LHkkICUwqFzg0 PQhPCTBVSlVKTUpCTUNMS0NMQ0lKVTMWGhIXVQwaFRwKEhUcOw0SDRRVGBQWRVlXWRILWUFZTkNV SU5LVUpMTVVJSUJZV1kIAVlBSE1ITDcG X-HM-Tid: 0a791cdf9d82da01kuws0a578400b3 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The watchdog thread has been replaced by cpu_stop_work, modify the explanation related. Signed-off-by: Wang Qing --- kernel/watchdog.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/kernel/watchdog.c b/kernel/watchdog.c index 7110906..d7fb4fb --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -92,7 +92,7 @@ __setup("nmi_watchdog=", hardlockup_panic_setup); * 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) @@ -322,7 +322,7 @@ static DEFINE_PER_CPU(struct completion, softlockup_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 @@ -551,11 +551,7 @@ static void lockup_detector_reconfigure(void) } /* - * 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) { @@ -621,7 +617,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. */ -- 2.7.4