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

Commit c07380be authored by James Hogan's avatar James Hogan
Browse files

Revert some of "binfmt_elf: cleanups" 



The commit "binfmt_elf: cleanups"
(f670d0ec) removed an ifndef elf_map but
this breaks compilation for metag which does define elf_map.

This adds the ifndef back in as it was before, but does not affect the
other cleanups made by that patch.

Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: linux-fsdevel@vger.kernel.org
Acked-by: default avatarMikael Pettersson <mikpe@it.uu.se>
parent 4dd3c959

fs/binfmt_elf.c

+4 −0
Original line number Diff line number Diff line
@@ -321,6 +321,8 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec, 
	return 0;

}



#ifndef elf_map



static unsigned long elf_map(struct file *filep, unsigned long addr,

		struct elf_phdr *eppnt, int prot, int type,

		unsigned long total_size)
@@ -355,6 +357,8 @@ static unsigned long elf_map(struct file *filep, unsigned long addr, 
	return(map_addr);

}



#endif /* !elf_map */



static unsigned long total_mapping_size(struct elf_phdr *cmds, int nr)

{

	int i, first_idx = -1, last_idx = -1;