| Message ID | 20220312042134.14686-1-rdunlap@infradead.org |
|---|---|
| State | New |
| Headers | show
Return-Path: <SRS0=wIxp=TX=vger.kernel.org=sparclinux-owner@ozlabs.org>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Authentication-Results: bilbo.ozlabs.org;
dkim=pass (2048-bit key;
secure) header.d=infradead.org header.i=@infradead.org header.a=rsa-sha256
header.s=bombadil.20210309 header.b=Xd8j2VPl;
dkim-atps=neutral
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest
SHA256)
(No client certificate requested)
by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KFqPd3WXtz9sG3
for <incoming@patchwork.ozlabs.org>; Sat, 12 Mar 2022 15:21:41 +1100 (AEDT)
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
by gandalf.ozlabs.org (Postfix) with ESMTP id 4KFqPb5Wgzz4xLY
for <incoming@patchwork.ozlabs.org>; Sat, 12 Mar 2022 15:21:39 +1100 (AEDT)
Received: by gandalf.ozlabs.org (Postfix)
id 4KFqPb4wP5z4xMW; Sat, 12 Mar 2022 15:21:39 +1100 (AEDT)
Delivered-To: patchwork-incoming@ozlabs.org
Authentication-Results: gandalf.ozlabs.org;
spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org
(client-ip=2620:137:e000::1:20; helo=out1.vger.email;
envelope-from=sparclinux-owner@vger.kernel.org; receiver=<UNKNOWN>)
Authentication-Results: gandalf.ozlabs.org;
dkim=pass (2048-bit key;
secure) header.d=infradead.org header.i=@infradead.org header.a=rsa-sha256
header.s=bombadil.20210309 header.b=Xd8j2VPl;
dkim-atps=neutral
Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20])
by gandalf.ozlabs.org (Postfix) with ESMTP id 4KFqPb4YXvz4xLY
for <patchwork-incoming@ozlabs.org>; Sat, 12 Mar 2022 15:21:39 +1100 (AEDT)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S230301AbiCLEWl (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);
Fri, 11 Mar 2022 23:22:41 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46684 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229502AbiCLEWk (ORCPT
<rfc822;sparclinux@vger.kernel.org>); Fri, 11 Mar 2022 23:22:40 -0500
Received: from bombadil.infradead.org (bombadil.infradead.org
[IPv6:2607:7c80:54:e::133])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A87E127F4C2;
Fri, 11 Mar 2022 20:21:35 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding:
MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:
Content-ID:Content-Description:In-Reply-To:References;
bh=9qw6NSJmY4N+TOcm/XFWYOffOfzyF+oqDEw5W0R7LO8=;
b=Xd8j2VPlUTyVVi88SdBLvC8YRW
+H/amb7Uzk5GRPQVPMcuqBjI/cigXJ3hxbf0fN2Az9+834VxLmE6Pq5TOCtw6rMUrgGstBVPjTMpV
mKsahXBAZ3PgDTAU0bT3rA063cCxPCv0Bfy+3b7wbPlgChOG/xQwyVWLytP/9hab+8NziNKilzCz2
6kAWcUS9yVPtHZWAzsJ+Yb1TEgvig3UP6PIde3kehJe55H5RI/IBAX02hW724nD9C+HhnPIe75Cnd
1FbSFu61LkSKEnFZ7ubY+MRg6Bf9r7OhYCEfsNHmScQZCu6kvRb+6YtxvSB2fS3JmOkEJOHnshu03
POMG9iuQ==;
Received: from [2601:1c0:6280:3f0::aa0b] (helo=bombadil.infradead.org)
by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat
Linux))
id 1nStG3-000kCi-7c; Sat, 12 Mar 2022 04:21:35 +0000
From: Randy Dunlap <rdunlap@infradead.org>
To: linux-kernel@vger.kernel.org
Cc: Randy Dunlap <rdunlap@infradead.org>,
"David S. Miller" <davem@davemloft.net>, sparclinux@vger.kernel.org
Subject: [PATCH] sparc64: NMI watchdog: fix return value of __setup handler
Date: Fri, 11 Mar 2022 20:21:34 -0800
Message-Id: <20220312042134.14686-1-rdunlap@infradead.org>
X-Mailer: git-send-email 2.34.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,
SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham 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: <sparclinux.vger.kernel.org>
X-Mailing-List: sparclinux@vger.kernel.org
|
| Series |
sparc64: NMI watchdog: fix return value of __setup handler
|
expand
|
--- linux-next-20220309.orig/arch/sparc/kernel/nmi.c +++ linux-next-20220309/arch/sparc/kernel/nmi.c @@ -274,7 +274,7 @@ static int __init setup_nmi_watchdog(cha if (!strncmp(str, "panic", 5)) panic_on_timeout = 1; - return 0; + return 1; } __setup("nmi_watchdog=", setup_nmi_watchdog);
__setup() handlers should return 1 to obsolete_checksetup() in init/main.c to indicate that the boot option has been handled. A return of 0 causes the boot option/value to be listed as an Unknown kernel parameter and added to init's (limited) argument or environment strings. Also, error return codes don't mean anything to obsolete_checksetup() -- only non-zero (usually 1) or zero. So return 1 from setup_nmi_watchdog(). Fixes: e5553a6d0442 ("sparc64: Implement NMI watchdog on capable cpus.") Signed-off-by: Randy Dunlap <rdunlap@infradead.org> From: Igor Zhbanov <i.zhbanov@omprussia.ru> Link: lore.kernel.org/r/64644a2f-4a20-bab3-1e15-3b2cdd0defe3@omprussia.ru Cc: "David S. Miller" <davem@davemloft.net> Cc: sparclinux@vger.kernel.org --- arch/sparc/kernel/nmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)