Skip to content

Commit

Permalink
fs/binfmt_elf: remove redundant elf_map ifndef
Browse files Browse the repository at this point in the history
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.

Link: http://lkml.kernel.org/r/20200402161543.4119-1-ailiop@suse.com
Signed-off-by: Anthony Iliopoulos <ailiop@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
  • Loading branch information
Anthony Iliopoulos authored and sfrothwell committed May 26, 2020
1 parent 56a582e commit 4e7ab62
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions fs/binfmt_elf.c
Original file line number Diff line number Diff line change
Expand Up @@ -347,8 +347,6 @@ create_elf_tables(struct linux_binprm *bprm, const struct elfhdr *exec,
return 0;
}

#ifndef elf_map

static unsigned long elf_map(struct file *filep, unsigned long addr,
const struct elf_phdr *eppnt, int prot, int type,
unsigned long total_size)
Expand Down Expand Up @@ -388,8 +386,6 @@ static unsigned long elf_map(struct file *filep, unsigned long addr,
return(map_addr);
}

#endif /* !elf_map */

static unsigned long total_mapping_size(const struct elf_phdr *cmds, int nr)
{
int i, first_idx = -1, last_idx = -1;
Expand Down

0 comments on commit 4e7ab62

Please sign in to comment.