diff options
| author |  Randy Dunlap <rdunlap@infradead.org>
| 2024-02-10 21:28:08 -0800 |
|---|---|---|
| committer |  Andreas Larsson <andreas@gaisler.com>
| 2024-02-16 16:50:26 +0100 |
| commit | 5378f00c935bebb846b1fdb0e79cb76c137c56b5 (patch) | |
| tree | 0fe9af3d0721df98d5ec4e020ae2649c2bb64221 /arch/sparc | |
| parent | sparc64: NMI watchdog: fix return value of __setup handler (diff) | |
| download | linux-5378f00c935bebb846b1fdb0e79cb76c137c56b5.tar.gz linux-5378f00c935bebb846b1fdb0e79cb76c137c56b5.tar.bz2 linux-5378f00c935bebb846b1fdb0e79cb76c137c56b5.zip | |
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: 9a08862a5d2e ("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
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/vdso/vma.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/sparc/vdso/vma.c b/arch/sparc/vdso/vma.c index 136c78f28f8b..1bbf4335de45 100644 --- a/arch/sparc/vdso/vma.c +++ b/arch/sparc/vdso/vma.c @@ -449,9 +449,8 @@ static __init int vdso_setup(char *s) unsigned long val; err = kstrtoul(s, 10, &val); - if (err) - return err; - vdso_enabled = val; - return 0; + if (!err) + vdso_enabled = val; + return 1; } __setup("vdso=", vdso_setup); |