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 E2C2047768; Mon, 1 Apr 2024 15:52:09 +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=1711986730; cv=none; b=U/PsKiT3AMfpecyU3JcFaaSkX089DhP0rVwlnARFFryJzgYLd9YXb5sGAHGReOzIcADehl27xn7TQwmX8dxglt6A4i4g2mmb8LL48QOGucEFD+f9bTDKhSbp5jldq3vLszVcUysG1UHLrLFjQmTmXNj62liU87eoAxs4WcdrQWY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711986730; c=relaxed/simple; bh=kcYpRHBkrw31yKDWEgNbPfZ32JYvHWwjx3vpz1/bb54=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sCg/c7KtgxUSnQ4+6rWRuGg1LJMcQfI4zELzpCYbaz2UbohRdDqjr03Bf09uEo0ge38nyFSdZUp59u+Fx6fOLyAHAGeKBQvPkfkltej1RwHMuA1btkYvLevHV5ZQadjt9d6rJ24hyUO9L2l4B/XbTPf7/oXuFBk9+Fcv57kweLg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=UTHTSXmY; 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="UTHTSXmY" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 013DBC433F1; Mon, 1 Apr 2024 15:52:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1711986729; bh=kcYpRHBkrw31yKDWEgNbPfZ32JYvHWwjx3vpz1/bb54=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UTHTSXmYFaGiTZnoLDh2oKtnTnU/4CV/dFmHEZCLg1o4MF2ujtHFjTj5GBZvHITt6 V/naKy0IxZ7ldnfq6xE4xuo/ahpYeOasq/wFPfijySqN4XlpL9e42tnWI2IlNl4Hwi QqzuDT6ZxNbimyx0O9dle9Ki6lJKlWjGo46TsFRs= 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 6.8 036/399] sparc64: NMI watchdog: fix return value of __setup handler Date: Mon, 1 Apr 2024 17:40:02 +0200 Message-ID: <20240401152550.242999480@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240401152549.131030308@linuxfoundation.org> References: <20240401152549.131030308@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 6.8-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 17cdfdbf1f3b7..149adc0947530 100644 --- a/arch/sparc/kernel/nmi.c +++ b/arch/sparc/kernel/nmi.c @@ -279,7 +279,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