Commit 852991dd authored Jun 04, 2020 by Anthony Iliopoulos Committed by Linus Torvalds Jun 04, 2020

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 <ailiop@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Link: http://lkml.kernel.org/r/20200402161543.4119-1-ailiop@suse.com


Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent c7f574d0

fs/binfmt_elf.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -353,8 +353,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)
		@@ -394,8 +392,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;

Admin message