X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=fs%2Fbinfmt_elf_fdpic.c;h=2c5f9a0e5d72bb0357c45d5524186c14b3284bca;hb=cb41838bbc4403f7270a94b93a9a0d9fc9c2e7ea;hp=7ab23e006e4cbb20c31c7d4fca47d283c96e3121;hpb=9623e5a23724d09283c238960946ec6f65733afe;p=linux-2.6-block.git

diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c
index 7ab23e006e4c..2c5f9a0e5d72 100644
--- a/fs/binfmt_elf_fdpic.c
+++ b/fs/binfmt_elf_fdpic.c
@@ -1005,15 +1005,8 @@ static int elf_fdpic_map_file_constdisp_on_uclinux(
 				}
 			} 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++;