aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRandy Dunlap <[email protected]>2024-02-10 21:28:08 -0800
committerAndreas Larsson <[email protected]>2024-02-16 16:50:26 +0100
commit5378f00c935bebb846b1fdb0e79cb76c137c56b5 (patch)
tree0fe9af3d0721df98d5ec4e020ae2649c2bb64221
parent3ed7c61e49d65dacb96db798c0ab6fcd55a1f20f (diff)
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 <[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]
-rw-r--r--arch/sparc/vdso/vma.c7
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);