Commit a4ccd64a authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman

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: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/11522eec6140f510a8c89c63cbb739277d097fdc.1601197618.git.christophe.leroy@csgroup.eu
parent 67a35405
...@@ -189,7 +189,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) ...@@ -189,7 +189,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
do_##type##_fixups((value), __start, __end); \ do_##type##_fixups((value), __start, __end); \
} while (0) } while (0)
static int __init vdso_fixup_features(void) static void __init vdso_fixup_features(void)
{ {
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64
VDSO_DO_FIXUPS(feature, cur_cpu_spec->cpu_features, 64, ftr_fixup); VDSO_DO_FIXUPS(feature, cur_cpu_spec->cpu_features, 64, ftr_fixup);
...@@ -206,16 +206,6 @@ static int __init vdso_fixup_features(void) ...@@ -206,16 +206,6 @@ static int __init vdso_fixup_features(void)
#endif /* CONFIG_PPC64 */ #endif /* CONFIG_PPC64 */
VDSO_DO_FIXUPS(lwsync, cur_cpu_spec->cpu_features, 32, lwsync_fixup); VDSO_DO_FIXUPS(lwsync, cur_cpu_spec->cpu_features, 32, lwsync_fixup);
#endif #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) ...@@ -310,14 +300,7 @@ static int __init vdso_init(void)
vdso_setup_syscall_map(); vdso_setup_syscall_map();
/* vdso_fixup_features();
* 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;
}
if (IS_ENABLED(CONFIG_VDSO32)) if (IS_ENABLED(CONFIG_VDSO32))
vdso32_spec.pages = vdso_setup_pages(&vdso32_start, &vdso32_end); vdso32_spec.pages = vdso_setup_pages(&vdso32_start, &vdso32_end);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment