Skip to content

Commit 852991d

Browse files
Anthony Iliopoulostorvalds
authored andcommitted
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: Anthony Iliopoulos <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Linus Torvalds <[email protected]>
1 parent c7f574d commit 852991d

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

fs/binfmt_elf.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -353,8 +353,6 @@ create_elf_tables(struct linux_binprm *bprm, const struct elfhdr *exec,
353353
return 0;
354354
}
355355

356-
#ifndef elf_map
357-
358356
static unsigned long elf_map(struct file *filep, unsigned long addr,
359357
const struct elf_phdr *eppnt, int prot, int type,
360358
unsigned long total_size)
@@ -394,8 +392,6 @@ static unsigned long elf_map(struct file *filep, unsigned long addr,
394392
return(map_addr);
395393
}
396394

397-
#endif /* !elf_map */
398-
399395
static unsigned long total_mapping_size(const struct elf_phdr *cmds, int nr)
400396
{
401397
int i, first_idx = -1, last_idx = -1;

0 commit comments

Comments
 (0)