summaryrefslogtreecommitdiff
path: root/arch/powerpc/kernel/vdso.c
diff options
context:
space:
mode:
authorChristophe Leroy <christophe.leroy@csgroup.eu>2020-09-27 09:16:43 +0000
committerMichael Ellerman <mpe@ellerman.id.au>2020-12-04 01:01:19 +1100
commita4ccd64acb8c08ce8d36001cdd06477deec6ae89 (patch)
tree8a430f6fbfe967d65231a41ce215893dc17360e2 /arch/powerpc/kernel/vdso.c
parent67a354051da28d482e53146def212b102664ce0e (diff)
powerpc/vdso: Remove vdso_setup()
vdso_fixup_features() cannot fail anymore and that's the only function called by vdso_setup(). vdso_setup() has become trivial and can be removed. Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/11522eec6140f510a8c89c63cbb739277d097fdc.1601197618.git.christophe.leroy@csgroup.eu
Diffstat (limited to 'arch/powerpc/kernel/vdso.c')
-rw-r--r--arch/powerpc/kernel/vdso.c21
1 files changed, 2 insertions, 19 deletions
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
index faff1d081ca8..93e09e45608c 100644
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
@@ -189,7 +189,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
do_##type##_fixups((value), __start, __end); \
} while (0)
-static int __init vdso_fixup_features(void)
+static void __init vdso_fixup_features(void)
{
#ifdef CONFIG_PPC64
VDSO_DO_FIXUPS(feature, cur_cpu_spec->cpu_features, 64, ftr_fixup);
@@ -206,16 +206,6 @@ static int __init vdso_fixup_features(void)
#endif /* CONFIG_PPC64 */
VDSO_DO_FIXUPS(lwsync, cur_cpu_spec->cpu_features, 32, lwsync_fixup);
#endif
-
- return 0;
-}
-
-static __init int vdso_setup(void)
-{
- if (vdso_fixup_features())
- return -1;
-
- return 0;
}
/*
@@ -310,14 +300,7 @@ static int __init vdso_init(void)
vdso_setup_syscall_map();
- /*
- * Initialize the vDSO images in memory, that is do necessary
- * fixups of vDSO symbols, locate trampolines, etc...
- */
- if (vdso_setup()) {
- printk(KERN_ERR "vDSO setup failure, not enabled !\n");
- return 0;
- }
+ vdso_fixup_features();
if (IS_ENABLED(CONFIG_VDSO32))
vdso32_spec.pages = vdso_setup_pages(&vdso32_start, &vdso32_end);