[PATCH] fs/binfmt_elf: remove redundant elf_map ifndef

From: Anthony Iliopoulos
Date: Thu Apr 02 2020 - 12:17:36 EST


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: Anthony Iliopoulos <ailiop@xxxxxxxx>
---
fs/binfmt_elf.c | 4 ----
1 file changed, 4 deletions(-)

diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index f4713ea76e82..89428c9732c4 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -346,8 +346,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)
@@ -387,8 +385,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;
--
2.16.4