]>
Commit | Line | Data |
---|---|---|
b7ca0ba0 SL |
1 | From fd51a6f0bd54bf3499b199f2820028718ee6ea11 Mon Sep 17 00:00:00 2001 |
2 | From: Sasha Levin <sashal@kernel.org> | |
3 | Date: Sat, 10 Feb 2024 21:28:02 -0800 | |
4 | Subject: sparc64: NMI watchdog: fix return value of __setup handler | |
5 | ||
6 | From: Randy Dunlap <rdunlap@infradead.org> | |
7 | ||
8 | [ Upstream commit 3ed7c61e49d65dacb96db798c0ab6fcd55a1f20f ] | |
9 | ||
10 | __setup() handlers should return 1 to obsolete_checksetup() in | |
11 | init/main.c to indicate that the boot option has been handled. | |
12 | A return of 0 causes the boot option/value to be listed as an Unknown | |
13 | kernel parameter and added to init's (limited) argument or environment | |
14 | strings. Also, error return codes don't mean anything to | |
15 | obsolete_checksetup() -- only non-zero (usually 1) or zero. | |
16 | So return 1 from setup_nmi_watchdog(). | |
17 | ||
18 | Fixes: e5553a6d0442 ("sparc64: Implement NMI watchdog on capable cpus.") | |
19 | Signed-off-by: Randy Dunlap <rdunlap@infradead.org> | |
20 | Reported-by: Igor Zhbanov <izh1979@gmail.com> | |
21 | Link: lore.kernel.org/r/64644a2f-4a20-bab3-1e15-3b2cdd0defe3@omprussia.ru | |
22 | Cc: "David S. Miller" <davem@davemloft.net> | |
23 | Cc: sparclinux@vger.kernel.org | |
24 | Cc: Sam Ravnborg <sam@ravnborg.org> | |
25 | Cc: Andrew Morton <akpm@linux-foundation.org> | |
26 | Cc: stable@vger.kernel.org | |
27 | Cc: Arnd Bergmann <arnd@arndb.de> | |
28 | Cc: Andreas Larsson <andreas@gaisler.com> | |
29 | Signed-off-by: Andreas Larsson <andreas@gaisler.com> | |
30 | Link: https://lore.kernel.org/r/20240211052802.22612-1-rdunlap@infradead.org | |
31 | Signed-off-by: Sasha Levin <sashal@kernel.org> | |
32 | --- | |
33 | arch/sparc/kernel/nmi.c | 2 +- | |
34 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
35 | ||
36 | diff --git a/arch/sparc/kernel/nmi.c b/arch/sparc/kernel/nmi.c | |
37 | index 060fff95a305c..fbf25e926f67c 100644 | |
38 | --- a/arch/sparc/kernel/nmi.c | |
39 | +++ b/arch/sparc/kernel/nmi.c | |
40 | @@ -274,7 +274,7 @@ static int __init setup_nmi_watchdog(char *str) | |
41 | if (!strncmp(str, "panic", 5)) | |
42 | panic_on_timeout = 1; | |
43 | ||
44 | - return 0; | |
45 | + return 1; | |
46 | } | |
47 | __setup("nmi_watchdog=", setup_nmi_watchdog); | |
48 | ||
49 | -- | |
50 | 2.43.0 | |
51 |