From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5AC36145353; Thu, 11 Apr 2024 10:14:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712830481; cv=none; b=LCfMeZMedbHNuqupk16Qs6q3AtPx37obB2AI2TRtyA/GmyS/N+MQgaGcpcVqGtNAuVB9EWTxMLMlKfHSrUASHZu1KAGE6IMTIsIGIt6ai9Bl4Hbo89QcUE1CKnFzcT0Ne4B9U3wgjDU8Q0ie6xNl48sj5uIMHHTPTDTsQQIAsAs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712830481; c=relaxed/simple; bh=cm3/ts1QfuZCE6uE1jOQ6PXKD3f4k1zSww4JFKvwi44=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=O8vL6XVK/dlMnJOPMZBP55G/axTTLT65XjKCkN+16kArZQoKZCWGhfG45Lbc6I4S+gpi28OHOitsMJybeYrkI96h3C6qjn1lFXyh2f+v4RCXu6Wz4dt1KoQ+awIaOlTN4jpPrFfDpPrf5pLL0gP6+Q/ncyElltl7PmQ4S1tk6ig= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=L6VAOEDU; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="L6VAOEDU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D264DC433C7; Thu, 11 Apr 2024 10:14:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1712830481; bh=cm3/ts1QfuZCE6uE1jOQ6PXKD3f4k1zSww4JFKvwi44=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L6VAOEDUOST89NcwVSrSZYwG5W6eplUZ3F8Kj/I+DZGZIEqDDyZJqFZJidCnI+r0Y R7oqHEcpGYwJU8h+coiknnwq2Tdg16ExdE/R0wlPl/gtzqczPT6n0m3dAAvy0lPXa9 lsDscfTXBh7MmXn02cAToX7LoyIcovvVunXIoc94= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Randy Dunlap , Igor Zhbanov , "David S. Miller" , sparclinux@vger.kernel.org, Sam Ravnborg , Andrew Morton , Arnd Bergmann , Andreas Larsson , Sasha Levin Subject: [PATCH 5.4 017/215] sparc64: NMI watchdog: fix return value of __setup handler Date: Thu, 11 Apr 2024 11:53:46 +0200 Message-ID: <20240411095425.401145404@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240411095424.875421572@linuxfoundation.org> References: <20240411095424.875421572@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Randy Dunlap [ Upstream commit 3ed7c61e49d65dacb96db798c0ab6fcd55a1f20f ] __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 Reported-by: Igor Zhbanov Link: lore.kernel.org/r/64644a2f-4a20-bab3-1e15-3b2cdd0defe3@omprussia.ru Cc: "David S. Miller" Cc: sparclinux@vger.kernel.org Cc: Sam Ravnborg Cc: Andrew Morton Cc: stable@vger.kernel.org Cc: Arnd Bergmann Cc: Andreas Larsson Signed-off-by: Andreas Larsson Link: https://lore.kernel.org/r/20240211052802.22612-1-rdunlap@infradead.org Signed-off-by: Sasha Levin --- arch/sparc/kernel/nmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/sparc/kernel/nmi.c b/arch/sparc/kernel/nmi.c index 060fff95a305c..fbf25e926f67c 100644 --- a/arch/sparc/kernel/nmi.c +++ b/arch/sparc/kernel/nmi.c @@ -274,7 +274,7 @@ static int __init setup_nmi_watchdog(char *str) if (!strncmp(str, "panic", 5)) panic_on_timeout = 1; - return 0; + return 1; } __setup("nmi_watchdog=", setup_nmi_watchdog); -- 2.43.0