summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/boot
diff options
context:
space:
mode:
authorOlaf Hering <olh@suse.de>2006-01-30 14:28:03 +0100
committerPaul Mackerras <paulus@samba.org>2006-02-07 12:38:39 +0100
commit158daa4cc827bda9f7206279a1dc55de2cb9c902 (patch)
tree2fdefa12f5bfa00c56255b0887aff442685b38a0 /arch/powerpc/boot
parent[PATCH] powerpc: Remove arch/ppc/syslib/ppc4xx_pm.c (diff)
downloadlinux-158daa4cc827bda9f7206279a1dc55de2cb9c902.tar.xz
linux-158daa4cc827bda9f7206279a1dc55de2cb9c902.zip
[PATCH] powerpc: remove check for ELF offset in powerpc bootimage
Do not check for offset, it is always set. Signed-off-by: Olaf Hering <olh@suse.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/boot')
-rw-r--r--arch/powerpc/boot/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/main.c b/arch/powerpc/boot/main.c
index 55ec59867250..816446f0e497 100644
--- a/arch/powerpc/boot/main.c
+++ b/arch/powerpc/boot/main.c
@@ -152,7 +152,7 @@ static int is_elf64(void *hdr)
elf64ph = (Elf64_Phdr *)((unsigned long)elf64 +
(unsigned long)elf64->e_phoff);
for (i = 0; i < (unsigned int)elf64->e_phnum; i++, elf64ph++)
- if (elf64ph->p_type == PT_LOAD && elf64ph->p_offset != 0)
+ if (elf64ph->p_type == PT_LOAD)
break;
if (i >= (unsigned int)elf64->e_phnum)
return 0;
@@ -193,7 +193,7 @@ static int is_elf32(void *hdr)
elf32 = (Elf32_Ehdr *)elfheader;
elf32ph = (Elf32_Phdr *) ((unsigned long)elf32 + elf32->e_phoff);
for (i = 0; i < elf32->e_phnum; i++, elf32ph++)
- if (elf32ph->p_type == PT_LOAD && elf32ph->p_offset != 0)
+ if (elf32ph->p_type == PT_LOAD)
break;
if (i >= elf32->e_phnum)
return 0;