Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16a5b3c4 authored by Christoph Egger's avatar Christoph Egger Committed by Linus Torvalds
Browse files

Remove redundant check for CONFIG_MMU 



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: default avatarChristoph Egger <siccegge@stud.informatik.uni-erlangen.de>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bc113f15

fs/binfmt_elf_fdpic.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -1005,15 +1005,8 @@ static int elf_fdpic_map_file_constdisp_on_uclinux( 
				}

				}

			} else if (!mm->start_data) {

			} else if (!mm->start_data) {

				mm->start_data = seg->addr;

				mm->start_data = seg->addr;

#ifndef CONFIG_MMU

				mm->end_data = seg->addr + phdr->p_memsz;

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

		seg++;