tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

fs/binfmt_elf.c: delete unused "interp_map_addr" argument

Link: http://lkml.kernel.org/r/20191005165049.GA26927@avx2
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Alexey Dobriyan and committed by
Linus Torvalds 81696d5d f2728fe8

+1 -6
+1 -6
fs/binfmt_elf.c
··· 544 544 an ELF header */ 545 545 546 546 static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex, 547 - struct file *interpreter, unsigned long *interp_map_addr, 547 + struct file *interpreter, 548 548 unsigned long no_base, struct elf_phdr *interp_elf_phdata) 549 549 { 550 550 struct elf_phdr *eppnt; ··· 590 590 map_addr = elf_map(interpreter, load_addr + vaddr, 591 591 eppnt, elf_prot, elf_type, total_size); 592 592 total_size = 0; 593 - if (!*interp_map_addr) 594 - *interp_map_addr = map_addr; 595 593 error = map_addr; 596 594 if (BAD_ADDR(map_addr)) 597 595 goto out; ··· 1052 1054 } 1053 1055 1054 1056 if (interpreter) { 1055 - unsigned long interp_map_addr = 0; 1056 - 1057 1057 elf_entry = load_elf_interp(&loc->interp_elf_ex, 1058 1058 interpreter, 1059 - &interp_map_addr, 1060 1059 load_bias, interp_elf_phdata); 1061 1060 if (!IS_ERR((void *)elf_entry)) { 1062 1061 /*