From 2f382c9b1426f89d6dd3cf75739e211696b9ab14 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Mon, 30 Jan 2006 14:28:03 +0100 Subject: [PATCH] --- yaml --- r: 22908 b: refs/heads/master c: 158daa4cc827bda9f7206279a1dc55de2cb9c902 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/boot/main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 880d878c6730..3ef6f0f327e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 155da5ff5798c46d941a836e0775f83ed888e73e +refs/heads/master: 158daa4cc827bda9f7206279a1dc55de2cb9c902 diff --git a/trunk/arch/powerpc/boot/main.c b/trunk/arch/powerpc/boot/main.c index 55ec59867250..816446f0e497 100644 --- a/trunk/arch/powerpc/boot/main.c +++ b/trunk/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;