The patch titled fs/binfmt_elf_fdpic.c: remove redundant check for CONFIG_MMU has been removed from the -mm tree. Its filename was remove-redundant-check-for-config_mmu.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: fs/binfmt_elf_fdpic.c: remove redundant check for CONFIG_MMU From: Christoph Egger <siccegge@xxxxxxxxx> The checks for CONFIG_MMU at this location are duplicated as all the code is located inside a #ifndef CONFIG_MMU block. So the first conditional block will always be included while the second never will. Signed-off-by: Christoph Egger <siccegge@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx> Signed-off-by: David Howells <dhowells@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/binfmt_elf_fdpic.c | 7 ------- 1 file changed, 7 deletions(-) diff -puN fs/binfmt_elf_fdpic.c~remove-redundant-check-for-config_mmu fs/binfmt_elf_fdpic.c --- a/fs/binfmt_elf_fdpic.c~remove-redundant-check-for-config_mmu +++ a/fs/binfmt_elf_fdpic.c @@ -1005,15 +1005,8 @@ static int elf_fdpic_map_file_constdisp_ } } else if (!mm->start_data) { mm->start_data = seg->addr; -#ifndef CONFIG_MMU mm->end_data = seg->addr + phdr->p_memsz; -#endif } - -#ifdef CONFIG_MMU - if (seg->addr + phdr->p_memsz > mm->end_data) - mm->end_data = seg->addr + phdr->p_memsz; -#endif } seg++; _ Patches currently in -mm which might be from siccegge@xxxxxxxxx are origin.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html