]> err.no Git - linux-2.6/commitdiff
[PATCH] powerpc: remove check for ELF offset in powerpc bootimage
authorOlaf Hering <olh@suse.de>
Mon, 30 Jan 2006 13:28:03 +0000 (14:28 +0100)
committerPaul Mackerras <paulus@samba.org>
Tue, 7 Feb 2006 11:38:39 +0000 (22:38 +1100)
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>
arch/powerpc/boot/main.c

index 55ec5986725079c24c56bef079c5f822700b9f0b..816446f0e497a64dda37c15f27ce0b6e4560a698 100644 (file)
@@ -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;