x86_64: fix arch_vma_name

The function arch_vma_name() is declared weak and thus it was
not noticed that x86_64 had two almost identical implementations.

It was introduced in syscall32.c by: c633090e3105e779c97d4978e5e3d7d66b291cfb
It was introduced in mm/init.c by: 2aae950b21e4bc789d1fc6668faf67e8748300b7

Signed-off-by: Roland McGrath <roland@redhat.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/x86_64/ia32/ia32_binfmt.c b/arch/x86_64/ia32/ia32_binfmt.c
index b70f3e7cf06ca7a8943b4d90a7027c6c7e8a42cf..dffd2ac72747b59836de76618f0c74089778424b 100644 (file)
--- a/arch/x86_64/ia32/ia32_binfmt.c
+++ b/arch/x86_64/ia32/ia32_binfmt.c
@@ -41,8 +41,9 @@ int sysctl_vsyscall32 = 1;
 #undef ARCH_DLINFO
 #define ARCH_DLINFO do {  \
        if (sysctl_vsyscall32) { \
-       NEW_AUX_ENT(AT_SYSINFO, (u32)(u64)VSYSCALL32_VSYSCALL); \
-       NEW_AUX_ENT(AT_SYSINFO_EHDR, VSYSCALL32_BASE);    \
+               current->mm->context.vdso = (void *)VSYSCALL32_BASE;    \
+               NEW_AUX_ENT(AT_SYSINFO, (u32)(u64)VSYSCALL32_VSYSCALL); \
+               NEW_AUX_ENT(AT_SYSINFO_EHDR, VSYSCALL32_BASE);    \
        }       \
 } while(0)
 

diff --git a/arch/x86_64/ia32/syscall32.c b/arch/x86_64/ia32/syscall32.c
index fc4419ff03558f398cbb5ae22811f5900d39241e..15013bac181c7ed42a9765137f58989d2de6dfa2 100644 (file)
--- a/arch/x86_64/ia32/syscall32.c
+++ b/arch/x86_64/ia32/syscall32.c
@@ -49,14 +49,6 @@ int syscall32_setup_pages(struct linux_binprm *bprm, int exstack)
        return ret;
 }
 
-const char *arch_vma_name(struct vm_area_struct *vma)
-{
-       if (vma->vm_start == VSYSCALL32_BASE &&
-           vma->vm_mm && vma->vm_mm->task_size == IA32_PAGE_OFFSET)
-               return "[vdso]";
-       return NULL;
-}
-
 static int __init init_syscall32(void)
 { 
        char *syscall32_page = (void *)get_zeroed_page(GFP_KERNEL);