[4.14,101/116] sh: nmi_debug: fix return value of __setup handler

Commit Message

Greg Kroah-Hartman May 15, 2023, 4:26 p.m. UTC

From: Randy Dunlap <[e-mail]>

commit d1155e4132de712a9d3066e2667ceaad39a539c5 upstream.

__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 nmi_debug_setup().

Fixes: 1e1030dccb10 ("sh: nmi_debug support.")
Signed-off-by: Randy Dunlap <[e-mail]>
Reported-by: Igor Zhbanov <[e-mail]>
Link: lore.kernel.org/r/[e-mail]
Cc: John Paul Adrian Glaubitz <[e-mail]>
Cc: Yoshinori Sato <[e-mail]>
Cc: Rich Felker <[e-mail]>
Cc: [e-mail]
Cc: [e-mail]
Reviewed-by: John Paul Adrian Glaubitz <[e-mail]>
Link: https://lore.kernel.org/r/[e-mail]
Signed-off-by: John Paul Adrian Glaubitz <[e-mail]>
Signed-off-by: Greg Kroah-Hartman <[e-mail]>
---
 arch/sh/kernel/nmi_debug.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

--- a/arch/sh/kernel/nmi_debug.c
+++ b/arch/sh/kernel/nmi_debug.c
@@ -52,7 +52,7 @@  static int __init nmi_debug_setup(char *
 	register_die_notifier(&nmi_debug_nb);
 
 	if (*str != '=')
-		return 0;
+		return 1;
 
 	for (p = str + 1; *p; p = sep + 1) {
 		sep = strchr(p, ',');
@@ -73,6 +73,6 @@  static int __init nmi_debug_setup(char *
 			break;
 	}
 
-	return 0;
+	return 1;
 }
 __setup("nmi_debug", nmi_debug_setup);