Skip to content

Commit 5378f00

Browse files
rddunlapandreas-gaisler
authored andcommitted
sparc: vDSO: 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 vdso_setup(). Fixes: 9a08862 ("vDSO for sparc") 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: Dan Carpenter <[email protected]> Cc: Nick Alcock <[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]
1 parent 3ed7c61 commit 5378f00

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

arch/sparc/vdso/vma.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -449,9 +449,8 @@ static __init int vdso_setup(char *s)
449449
unsigned long val;
450450

451451
err = kstrtoul(s, 10, &val);
452-
if (err)
453-
return err;
454-
vdso_enabled = val;
455-
return 0;
452+
if (!err)
453+
vdso_enabled = val;
454+
return 1;
456455
}
457456
__setup("vdso=", vdso_setup);

0 commit comments

Comments
 (0)