Commit 852991dd authored by Anthony Iliopoulos's avatar Anthony Iliopoulos Committed by Linus Torvalds

fs/binfmt_elf: remove redundant elf_map ifndef

The ifndef was added a long time ago to support archs that would define
their own mapping function.  The last user was the metag arch which was
removed from the tree, and as such there are no users left.  Let's kill
it.
Signed-off-by: default avatarAnthony Iliopoulos <ailiop@suse.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Link: http://lkml.kernel.org/r/20200402161543.4119-1-ailiop@suse.comSigned-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c7f574d0
...@@ -353,8 +353,6 @@ create_elf_tables(struct linux_binprm *bprm, const struct elfhdr *exec, ...@@ -353,8 +353,6 @@ create_elf_tables(struct linux_binprm *bprm, const struct elfhdr *exec,
return 0; return 0;
} }
#ifndef elf_map
static unsigned long elf_map(struct file *filep, unsigned long addr, static unsigned long elf_map(struct file *filep, unsigned long addr,
const struct elf_phdr *eppnt, int prot, int type, const struct elf_phdr *eppnt, int prot, int type,
unsigned long total_size) unsigned long total_size)
...@@ -394,8 +392,6 @@ static unsigned long elf_map(struct file *filep, unsigned long addr, ...@@ -394,8 +392,6 @@ static unsigned long elf_map(struct file *filep, unsigned long addr,
return(map_addr); return(map_addr);
} }
#endif /* !elf_map */
static unsigned long total_mapping_size(const struct elf_phdr *cmds, int nr) static unsigned long total_mapping_size(const struct elf_phdr *cmds, int nr)
{ {
int i, first_idx = -1, last_idx = -1; int i, first_idx = -1, last_idx = -1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment