From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 61249C0015E for ; Sun, 16 Jul 2023 20:02:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231142AbjGPUCr (ORCPT ); Sun, 16 Jul 2023 16:02:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231146AbjGPUCq (ORCPT ); Sun, 16 Jul 2023 16:02:46 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07D2BFD for ; Sun, 16 Jul 2023 13:02:46 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9B2DC60EAA for ; Sun, 16 Jul 2023 20:02:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 87318C433C8; Sun, 16 Jul 2023 20:02:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1689537765; bh=NY59dffSGlJSFxkaQNqMr7fxXegmbd8oIDGZI/xyknU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kGE6XH0E+Ry+mdSQKMW8BoMPAo+MVXvP86eZOyc/+Jgdm/vEqftbdH1sYgHyZwL6A 5YXYvUtNZWCxt8gYBXtb/iCx7lNd5R8ZYplI5BUjJ/OWJjAQpmMdkBrQvaPFdFYfJ3 RjSDD33EVwlqYMJw5ppF0Uws9bUVq0AMY2fNVMas= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Pingfan Liu , Lecopzer Chen , Douglas Anderson , Petr Mladek , Andi Kleen , Catalin Marinas , Chen-Yu Tsai , Christophe Leroy , Colin Cross , Daniel Thompson , "David S. Miller" , Guenter Roeck , Ian Rogers , Marc Zyngier , Mark Rutland , Masayoshi Mizuma , Matthias Kaehlcke , Michael Ellerman , Nicholas Piggin , Randy Dunlap , "Ravi V. Shankar" , Ricardo Neri , Stephane Eranian , Stephen Boyd , Sumit Garg , Tzung-Bi Shih , Will Deacon , Andrew Morton , Sasha Levin Subject: [PATCH 6.4 183/800] watchdog: remove WATCHDOG_DEFAULT Date: Sun, 16 Jul 2023 21:40:36 +0200 Message-ID: <20230716194953.354046942@linuxfoundation.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230716194949.099592437@linuxfoundation.org> References: <20230716194949.099592437@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Lecopzer Chen [ Upstream commit 810b560e8985725dbd57bbb3f188c231365eb5ae ] No reference to WATCHDOG_DEFAULT, remove it. Link: https://lkml.kernel.org/r/20230519101840.v5.3.I6a729209a1320e0ad212176e250ff945b8f91b2a@changeid Signed-off-by: Pingfan Liu Signed-off-by: Lecopzer Chen Signed-off-by: Douglas Anderson Reviewed-by: Petr Mladek Cc: Andi Kleen Cc: Catalin Marinas Cc: Chen-Yu Tsai Cc: Christophe Leroy Cc: Colin Cross Cc: Daniel Thompson Cc: "David S. Miller" Cc: Guenter Roeck Cc: Ian Rogers Cc: Marc Zyngier Cc: Mark Rutland Cc: Masayoshi Mizuma Cc: Matthias Kaehlcke Cc: Michael Ellerman Cc: Nicholas Piggin Cc: Randy Dunlap Cc: "Ravi V. Shankar" Cc: Ricardo Neri Cc: Stephane Eranian Cc: Stephen Boyd Cc: Sumit Garg Cc: Tzung-Bi Shih Cc: Will Deacon Signed-off-by: Andrew Morton Stable-dep-of: 9ec272c586b0 ("watchdog/hardlockup: keep kernel.nmi_watchdog sysctl as 0444 if probe fails") Signed-off-by: Sasha Levin --- kernel/watchdog.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/kernel/watchdog.c b/kernel/watchdog.c index 8e61f21e7e33e..582d572e13797 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -30,10 +30,8 @@ static DEFINE_MUTEX(watchdog_mutex); #if defined(CONFIG_HARDLOCKUP_DETECTOR) || defined(CONFIG_HAVE_NMI_WATCHDOG) -# define WATCHDOG_DEFAULT (SOFT_WATCHDOG_ENABLED | NMI_WATCHDOG_ENABLED) # define NMI_WATCHDOG_DEFAULT 1 #else -# define WATCHDOG_DEFAULT (SOFT_WATCHDOG_ENABLED) # define NMI_WATCHDOG_DEFAULT 0 #endif -- 2.39.2