Remove redundant check for CONFIG_MMU
authorChristoph Egger <siccegge@cs.fau.de>
Mon, 26 Apr 2010 14:56:36 +0000 (15:56 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Apr 2010 16:01:26 +0000 (09:01 -0700)
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@stud.informatik.uni-erlangen.de>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/binfmt_elf_fdpic.c

index 7ab23e006e4cbb20c31c7d4fca47d283c96e3121..2c5f9a0e5d72bb0357c45d5524186c14b3284bca 100644 (file)
@@ -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++;