aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRandy Dunlap <[email protected]>2024-02-10 21:28:02 -0800
committerAndreas Larsson <[email protected]>2024-02-16 16:50:25 +0100
commit3ed7c61e49d65dacb96db798c0ab6fcd55a1f20f (patch)
tree9175de7699b7860a38f741faec68b045d6f5878c
parent079431ea9ed3eef871b7b92bb02d411020000679 (diff)
sparc64: NMI watchdog: fix return value of __setup handler
__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 <[email protected]> Reported-by: Igor Zhbanov <[email protected]> Link: lore.kernel.org/r/[email protected] Cc: "David S. Miller" <[email protected]> Cc: [email protected] Cc: Sam Ravnborg <[email protected]> Cc: Andrew Morton <[email protected]> Cc: [email protected] Cc: Arnd Bergmann <[email protected]> Cc: Andreas Larsson <[email protected]> Signed-off-by: Andreas Larsson <[email protected]> Link: https://lore.kernel.org/r/[email protected]
-rw-r--r--arch/sparc/kernel/nmi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/nmi.c b/arch/sparc/kernel/nmi.c
index 17cdfdbf1f3b..149adc094753 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);