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 <rdunlap@infradead.org> Reported-by: Igor Zhbanov <izh1979@gmail.com> Link: lore.kernel.org/r/64644a2f-4a20-bab3-1e15-3b2cdd0defe3@omprussia.ru Cc: "David S. Miller" <davem@davemloft.net> Cc: sparclinux@vger.kernel.org Cc: Dan Carpenter <dan.carpenter@oracle.com> Cc: Nick Alcock <nick.alcock@oracle.com> Cc: Sam Ravnborg <sam@ravnborg.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: stable@vger.kernel.org Cc: Arnd Bergmann <arnd@arndb.de> Cc: Andreas Larsson <andreas@gaisler.com> Signed-off-by: Andreas Larsson <andreas@gaisler.com> Link: https://lore.kernel.org/r/20240211052808.22635-1-rdunlap@infradead.org
1 parent 3ed7c61 commit 5378f00

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

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)