aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/binfmt_elf.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 0c42cdbabecf..cfc22c9d75bc 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -321,6 +321,8 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
321 return 0; 321 return 0;
322} 322}
323 323
324#ifndef elf_map
325
324static unsigned long elf_map(struct file *filep, unsigned long addr, 326static unsigned long elf_map(struct file *filep, unsigned long addr,
325 struct elf_phdr *eppnt, int prot, int type, 327 struct elf_phdr *eppnt, int prot, int type,
326 unsigned long total_size) 328 unsigned long total_size)
@@ -355,6 +357,8 @@ static unsigned long elf_map(struct file *filep, unsigned long addr,
355 return(map_addr); 357 return(map_addr);
356} 358}
357 359
360#endif /* !elf_map */
361
358static unsigned long total_mapping_size(struct elf_phdr *cmds, int nr) 362static unsigned long total_mapping_size(struct elf_phdr *cmds, int nr)
359{ 363{
360 int i, first_idx = -1, last_idx = -1; 364 int i, first_idx = -1, last_idx = -1;