2024-02-11 05:28:19

by Randy Dunlap

[permalink] [raw]
Subject: [PATCH v5] 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]>
---
v2: change From: Igor to Reported-by:
add more Cc's
v3: use Igor's current email address
v4: add Arnd to Cc: list
v5: add Andreas to Cc: list

arch/sparc/kernel/nmi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff -- a/arch/sparc/kernel/nmi.c b/arch/sparc/kernel/nmi.c
--- a/arch/sparc/kernel/nmi.c
+++ b/arch/sparc/kernel/nmi.c
@@ -279,7 +279,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);



2024-02-16 16:33:50

by Andreas Larsson

[permalink] [raw]
Subject: Re: [PATCH v5] sparc64: NMI watchdog: fix return value of __setup handler



On 2024-02-11 06:28, Randy Dunlap wrote:
> __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]>

Applied to my for-next branch.

Thanks,
Andreas