Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 369F5C07E96 for ; Tue, 6 Jul 2021 19:08:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1B44961C84 for ; Tue, 6 Jul 2021 19:08:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231718AbhGFTLX (ORCPT ); Tue, 6 Jul 2021 15:11:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:46100 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231716AbhGFTLW (ORCPT ); Tue, 6 Jul 2021 15:11:22 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A1C9861C81; Tue, 6 Jul 2021 19:08:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1625598524; bh=0oUxVUp5OpM4VsoG9iZy3Iy7F6V3i96NVNBKZabBf3I=; h=Date:From:To:Subject:From; b=v9Y/dXeco42f0clmKY1FRud9dAxFcK/ZCBHPHbQNUY1+QQr+iLrEU9LBbs4RpuDgY jwou80hY3OS2N9coKeXABZAVIFjPqKoAlnk4r+m8ChIRqrPadvgZ4Rg7ENbJucXsb8 vLUIpaXDRLujPAOakl9V2GR11MkPf2DpRMJSgPvg= Date: Tue, 06 Jul 2021 12:08:43 -0700 From: akpm@linux-foundation.org To: corbet@lwn.net, gpiccoli@canonical.com, joe@perches.com, keescook@chromium.org, mchehab+huawei@kernel.org, mm-commits@vger.kernel.org, pmladek@suse.com, qais.yousef@arm.com, rdunlap@infradead.org, santosh@fossix.org, steve@sk2.org, vbabka@suse.cz, wangqing@vivo.com Subject: [merged] kernel-watchdog-modify-the-explanation-related-to-watchdog-thread.patch removed from -mm tree Message-ID: <20210706190843.NSIjqXjpY%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org 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 Subject: 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 Reviewed-by: Petr Mladek Cc: Jonathan Corbet Cc: Mauro Carvalho Chehab Cc: Joe Perches Cc: Stephen Kitt Cc: Kees Cook Cc: Randy Dunlap Cc: "Guilherme G. Piccoli" Cc: Qais Yousef Cc: Santosh Sivaraj Cc: Vlastimil Babka Signed-off-by: Andrew Morton --- kernel/watchdog.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) --- a/kernel/watchdog.c~kernel-watchdog-modify-the-explanation-related-to-watchdog-thread +++ a/kernel/watchdog.c @@ -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 wangqing@vivo.com are