[PATCH] Remove redundant check for CONFIG_MMU

Previous thread: [PATCH] ieee802154: Fix oops during ieee802154_sock_ioctl by Dmitry Eremin-Solenikov on Monday, April 26, 2010 - 7:46 am. (2 messages)

Next thread: Linux 2.6.32.12 by Greg KH on Monday, April 26, 2010 - 7:57 am. (2 messages)
From: David Howells
Date: Monday, April 26, 2010 - 7:56 am

From: Christoph Egger <siccegge@cs.fau.de>

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>
---

 fs/binfmt_elf_fdpic.c |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)


diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c
index 7ab23e0..2c5f9a0 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++;

--

Previous thread: [PATCH] ieee802154: Fix oops during ieee802154_sock_ioctl by Dmitry Eremin-Solenikov on Monday, April 26, 2010 - 7:46 am. (2 messages)

Next thread: Linux 2.6.32.12 by Greg KH on Monday, April 26, 2010 - 7:57 am. (2 messages)