Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ebc3cc9 authored by Roland McGrath's avatar Roland McGrath Committed by Linus Torvalds
Browse files

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: c633090e
It was introduced in mm/init.c by: 2aae950b

Signed-off-by: default avatarRoland McGrath <roland@redhat.com>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 26b97237

arch/x86_64/ia32/ia32_binfmt.c

+3 −2
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ int sysctl_vsyscall32 = 1; 
#undef ARCH_DLINFO

#define ARCH_DLINFO do {  \

	if (sysctl_vsyscall32) { \

		current->mm->context.vdso = (void *)VSYSCALL32_BASE;	\

		NEW_AUX_ENT(AT_SYSINFO, (u32)(u64)VSYSCALL32_VSYSCALL); \

		NEW_AUX_ENT(AT_SYSINFO_EHDR, VSYSCALL32_BASE);    \

	}	\

arch/x86_64/ia32/syscall32.c

+0 −8
Original line number Diff line number Diff line
@@ -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);