Skip to content

Commit d1155e4

Browse files
rddunlapglaubitz
authored andcommitted
sh: nmi_debug: 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 nmi_debug_setup(). Fixes: 1e1030d ("sh: nmi_debug support.") Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Reported-by: Igor Zhbanov <izh1979@gmail.com> Link: lore.kernel.org/r/64644a2f-4a20-bab3-1e15-3b2cdd0defe3@omprussia.ru Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Cc: Rich Felker <dalias@libc.org> Cc: linux-sh@vger.kernel.org Cc: stable@vger.kernel.org Reviewed-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Link: https://lore.kernel.org/r/20230306040037.20350-3-rdunlap@infradead.org Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
1 parent 68c37f9 commit d1155e4

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

arch/sh/kernel/nmi_debug.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ static int __init nmi_debug_setup(char *str)
4949
register_die_notifier(&nmi_debug_nb);
5050

5151
if (*str != '=')
52-
return 0;
52+
return 1;
5353

5454
for (p = str + 1; *p; p = sep + 1) {
5555
sep = strchr(p, ',');
@@ -70,6 +70,6 @@ static int __init nmi_debug_setup(char *str)
7070
break;
7171
}
7272

73-
return 0;
73+
return 1;
7474
}
7575
__setup("nmi_debug", nmi_debug_setup);

0 commit comments

Comments
 (0)