From patchwork Fri May 19 17:18:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 96538 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1397868vqo; Fri, 19 May 2023 10:22:48 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5ceCFkGPIC0F+IqPzAE1p0lj1oVXzsFLu1eHMT2Uc/04lX8j/0P+kTSKEQAoVQDd8Vdc07 X-Received: by 2002:a05:6a20:438f:b0:109:c216:bc82 with SMTP id i15-20020a056a20438f00b00109c216bc82mr2628270pzl.44.1684516968377; Fri, 19 May 2023 10:22:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684516968; cv=none; d=google.com; s=arc-20160816; b=DU/ElU5jdneiEomLhfdTiIzqhH04bXSF5qCMkVvNR5Oqu0o2FhGEF6h/qUOWAq7/UB 0oyPNnWRFvkA1yKUek4rgs9+ZpMqnjXIJCXXvPA+/0oUTz3bJ7lYHkfK+qR2yUZbO0fG rd0a4jGeShU2F870bq4+0Wi6CqtCDVtVJm8j4zQdAowBZPeTxIqJVNamv5LfVMWwBjcN JBUJ4Jc2oO+uSdi62wem2CeoYJkMJESF3AwTV/RDkbnqQPsnGmjKctwLJEwmUf3VRVOc V2aPlUX9bDC9ltXMM9K9PjMIWxfEekKzycGNGvQo5B1X7pGZfEHMbx0aEQE6hcjKyTJR NEBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=DMiz3to86FkP1q0hsF+Wqo3XfK/5ADGMUL6fQvRPMH0=; b=qRu/jyn4oxvK0tl6HHwpw3oQYe5uPX6AvQilqmTxu4ZIaDY06yIaTzK+4nSHoSI2AR 15X91j/jJltY67v8fnUGqm905afFRcPYhU0wu6H/XiwN31Ki/1z3aMIjB2UuzQcC7HhR K2QAVuk+wKuQ57Rl5CzuX3gNvxAfElXIjnzKLLqE5yU8mPVVePRhxVzmWsmiSBmAi9O9 gnYAHM/cLh+U4mNWSiOTTfO57JBr+2whRcdDR1WfqWkNq0PJw8csSHY9h4ewgGG9/s1x ftllBuYdZ+T+T/S7U6njvHJP5m6EQHoz6vt+p/fxstMZXn8uDiDQWOhX9P1ysg2IAPKz yLMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Cx6hTxwo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z14-20020a63b04e000000b0052cb36e0bfcsi3821026pgo.197.2023.05.19.10.22.35; Fri, 19 May 2023 10:22:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Cx6hTxwo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231169AbjESRVG (ORCPT + 99 others); Fri, 19 May 2023 13:21:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230282AbjESRUu (ORCPT ); Fri, 19 May 2023 13:20:50 -0400 Received: from mail-pg1-x52a.google.com (mail-pg1-x52a.google.com [IPv6:2607:f8b0:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E82421BD for ; Fri, 19 May 2023 10:20:45 -0700 (PDT) Received: by mail-pg1-x52a.google.com with SMTP id 41be03b00d2f7-517bdc9e81dso1901162a12.1 for ; Fri, 19 May 2023 10:20:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1684516845; x=1687108845; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DMiz3to86FkP1q0hsF+Wqo3XfK/5ADGMUL6fQvRPMH0=; b=Cx6hTxwoprK8nUSIr03lPivHKWjjrogjswRvDLx9AuLo18B3eXilhScKopQDoLt8fc +q6ht7zyx2kXwb9NKPseHI6ovEC8lXOX8XuINlRUG9Or8F+YWU6HTqNhrvahAhe/CDpz 7qq4gMO1UU4e69rpklfI1U8z/wIJemk+nXOfQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684516845; x=1687108845; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DMiz3to86FkP1q0hsF+Wqo3XfK/5ADGMUL6fQvRPMH0=; b=LGc5BFIaKKjbJ6+JSHifiazcxVEWbUuwtokpwawe+vfaAwlxKdyJVFnEbmfyyAFEHx Ye2uyTUmEFDtE0y1aQfaodCq6xBDXk81MV9z2X163iFuYRkWRhBRXL56+jDclf5RWsRu xk2hN0LTN+I5UyyDNrzUUZlrmOPmzn7vf+gUKu0GzKgfagWnLUe68HiM+ZppGVKewUtt KD1pLu0L4z8mvzHb5cm7eAurMYgDRUMk2JamPd10xr0PsHc+VtCA02ldxdeKVy5ZaRfX dLMTkM2H0DXafiwPUb0rZsmxWDGzUC3uWUNIH6nzyn7Ic0PPh6OYWosVPITuQsG0CeIf Ewhg== X-Gm-Message-State: AC+VfDxyULJ23kOLQajG01i/MP6SlNQ8xaQzdPWN2Gcc3/na5DUMKgxI AgLknUquVE2QfEhGKRdTQAhT0g== X-Received: by 2002:a17:90a:d105:b0:23f:6d4e:72b3 with SMTP id l5-20020a17090ad10500b0023f6d4e72b3mr2809893pju.25.1684516845320; Fri, 19 May 2023 10:20:45 -0700 (PDT) Received: from tictac2.mtv.corp.google.com ([2620:15c:9d:2:9b89:2dd0:d160:429d]) by smtp.gmail.com with ESMTPSA id gj19-20020a17090b109300b0024e4f169931sm1763835pjb.2.2023.05.19.10.20.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 May 2023 10:20:44 -0700 (PDT) From: Douglas Anderson To: Petr Mladek , Andrew Morton Cc: Matthias Kaehlcke , kgdb-bugreport@lists.sourceforge.net, Stephane Eranian , mpe@ellerman.id.au, Tzung-Bi Shih , Daniel Thompson , Mark Rutland , linuxppc-dev@lists.ozlabs.org, Sumit Garg , npiggin@gmail.com, davem@davemloft.net, Marc Zyngier , Stephen Boyd , sparclinux@vger.kernel.org, christophe.leroy@csgroup.eu, Catalin Marinas , ravi.v.shankar@intel.com, Randy Dunlap , Pingfan Liu , Guenter Roeck , Lecopzer Chen , Ian Rogers , ito-yuichi@fujitsu.com, ricardo.neri@intel.com, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, Will Deacon , Chen-Yu Tsai , linux-kernel@vger.kernel.org, Masayoshi Mizuma , Andi Kleen , Douglas Anderson Subject: [PATCH v5 03/18] watchdog: remove WATCHDOG_DEFAULT Date: Fri, 19 May 2023 10:18:27 -0700 Message-ID: <20230519101840.v5.3.I6a729209a1320e0ad212176e250ff945b8f91b2a@changeid> X-Mailer: git-send-email 2.40.1.698.g37aff9b760-goog In-Reply-To: <20230519101840.v5.18.Ia44852044cdcb074f387e80df6b45e892965d4a1@changeid> References: <20230519101840.v5.18.Ia44852044cdcb074f387e80df6b45e892965d4a1@changeid> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766344064395494620?= X-GMAIL-MSGID: =?utf-8?q?1766344064395494620?= From: Lecopzer Chen No reference to WATCHDOG_DEFAULT, remove it. Signed-off-by: Pingfan Liu Signed-off-by: Lecopzer Chen Reviewed-by: Petr Mladek Signed-off-by: Douglas Anderson --- I yanked this patch from the mailing lists [1] into my series just to make it easier to avoid conflicts between my series and the one adding the arm64 perf hardlockup detector, in case someone wanted to test them both together. This is a nice cleanup and could land together with the rest of my series if that makes sense. I changed the patch prefix to match others in my series. [1] https://lore.kernel.org/r/20220903093415.15850-2-lecopzer.chen@mediatek.com/ (no changes since v4) Changes in v4: - Pulled ("remove WATCHDOG_DEFAULT") into my series for v4. kernel/watchdog.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/kernel/watchdog.c b/kernel/watchdog.c index 8e61f21e7e33..582d572e1379 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