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

Commit 562795fe authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[PATCH] x86_64: Remove elf32_map in 32bit ELF loader 



It's identical to the standard elf_map.

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f0cf5d1a

arch/x86_64/ia32/ia32_binfmt.c

+0 −17
Original line number Diff line number Diff line
@@ -293,8 +293,6 @@ int ia32_setup_arg_pages(struct linux_binprm *bprm, unsigned long stack_top, int 
} while(0) 





#define elf_map elf32_map



#include <linux/module.h>



MODULE_DESCRIPTION("Binary format loader for compatibility with IA32 ELF binaries.");
@@ -390,21 +388,6 @@ int ia32_setup_arg_pages(struct linux_binprm *bprm, unsigned long stack_top, 
}

EXPORT_SYMBOL(ia32_setup_arg_pages);



static unsigned long

elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type)

{

	unsigned long map_addr;

	struct task_struct *me = current; 



	down_write(&me->mm->mmap_sem);

	map_addr = do_mmap(filep, ELF_PAGESTART(addr),

			   eppnt->p_filesz + ELF_PAGEOFFSET(eppnt->p_vaddr), prot, 

			   type,

			   eppnt->p_offset - ELF_PAGEOFFSET(eppnt->p_vaddr));

	up_write(&me->mm->mmap_sem);

	return(map_addr);

}



#ifdef CONFIG_SYSCTL

/* Register vsyscall32 into the ABI table */

#include <linux/sysctl.h>