| Context |
Check |
Description |
| snowpatch_ozlabs/apply_patch |
warning
|
Failed to apply on branch powerpc/merge (548ccca2a8864b7498ad8cc420fa01aecd4d4114)
|
| snowpatch_ozlabs/apply_patch |
warning
|
Failed to apply on branch powerpc/next (ebbfeef0d8093a06ff39c60105b6650be3344cbe)
|
| snowpatch_ozlabs/apply_patch |
warning
|
Failed to apply on branch linus/master (a1bffa48745afbb54cb4f873bba783b2ae8be042)
|
| snowpatch_ozlabs/apply_patch |
warning
|
Failed to apply on branch powerpc/fixes (0460534b532e5518c657c7d6492b9337d975eaa3)
|
| snowpatch_ozlabs/apply_patch |
warning
|
Failed to apply on branch linux-next (20dc779fdefc40bf7dd9736cea01704f29228fae)
|
| snowpatch_ozlabs/apply_patch |
fail
|
Failed to apply to any branch
|
@@ -44,11 +44,8 @@
/* The alignment of the vDSO */
#define VDSO_ALIGNMENT (1 << 16)
-static void *vdso32_kbase;
-
extern char vdso32_start, vdso32_end;
extern char vdso64_start, vdso64_end;
-static void *vdso64_kbase = &vdso64_start;
static int vdso_ready;
@@ -63,20 +60,6 @@ static union {
} vdso_data_store __page_aligned_data;
struct vdso_arch_data *vdso_data = &vdso_data_store.data;
-/*
- * Some infos carried around for each of them during parsing at
- * boot time.
- */
-struct lib32_elfinfo
-{
- Elf32_Ehdr *hdr; /* ptr to ELF */
-};
-
-struct lib64_elfinfo
-{
- Elf64_Ehdr *hdr;
-};
-
static int vdso_mremap(const struct vm_special_mapping *sm, struct vm_area_struct *new_vma,
unsigned long text_size)
{
@@ -209,8 +192,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
do_##type##_fixups((value), __start, __end); \
} while (0)
-static __init int vdso_fixup_features(struct lib32_elfinfo *v32,
- struct lib64_elfinfo *v64)
+static int __init vdso_fixup_features(void)
{
#ifdef CONFIG_PPC64
VDSO_DO_FIXUPS(feature, cur_cpu_spec->cpu_features, 64, ftr_fixup);
@@ -233,12 +215,7 @@ static __init int vdso_fixup_features(struct lib32_elfinfo *v32,
static __init int vdso_setup(void)
{
- struct lib32_elfinfo v32;
- struct lib64_elfinfo v64;
-
- v32.hdr = vdso32_kbase;
- v64.hdr = vdso64_kbase;
- if (vdso_fixup_features(&v32, &v64))
+ if (vdso_fixup_features())
return -1;
return 0;
@@ -334,8 +311,6 @@ static int __init vdso_init(void)
vdso_data->icache_log_block_size = ppc64_caches.l1i.log_block_size;
#endif /* CONFIG_PPC64 */
- vdso32_kbase = &vdso32_start;
-
vdso_setup_syscall_map();
/*
lib32_elfinfo and lib64_elfinfo are not used anymore, remove them. Also remove vdso32_kbase and vdso64_kbase while removing the last use. Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> --- arch/powerpc/kernel/vdso.c | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-)