From c3cee413316a388b294d8a50fa22ced65c6be01b Mon Sep 17 00:00:00 2001 From: proski Date: Sun, 21 Jun 2009 23:55:23 +0000 Subject: [PATCH] 2009-06-21 Pavel Roskin * loader/powerpc/ieee1275/linux.c (offset_phdr): Fix prototypes to match nested functions. * loader/sparc64/ieee1275/linux.c: Likewise. --- ChangeLog | 4 ++++ loader/powerpc/ieee1275/linux.c | 4 ++-- loader/sparc64/ieee1275/linux.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index bef575951..2b1e27340 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2009-06-21 Pavel Roskin + * loader/powerpc/ieee1275/linux.c (offset_phdr): Fix prototypes + to match nested functions. + * loader/sparc64/ieee1275/linux.c: Likewise. + * conf/i386-ieee1275.rmk: Define kernel_elf_ASFLAGS. 2009-06-21 Robert Millan diff --git a/loader/powerpc/ieee1275/linux.c b/loader/powerpc/ieee1275/linux.c index f183c8625..79fbf0b02 100644 --- a/loader/powerpc/ieee1275/linux.c +++ b/loader/powerpc/ieee1275/linux.c @@ -131,7 +131,7 @@ grub_linux_load32 (grub_elf_t elf) return grub_error (GRUB_ERR_OUT_OF_MEMORY, "Could not claim memory."); /* Now load the segments into the area we claimed. */ - auto grub_err_t offset_phdr (Elf32_Phdr *phdr, grub_addr_t *addr); + auto grub_err_t offset_phdr (Elf32_Phdr *phdr, grub_addr_t *addr, int *do_load); grub_err_t offset_phdr (Elf32_Phdr *phdr, grub_addr_t *addr, int *do_load) { if (phdr->p_type != PT_LOAD) @@ -181,7 +181,7 @@ grub_linux_load64 (grub_elf_t elf) return grub_error (GRUB_ERR_OUT_OF_MEMORY, "Could not claim memory."); /* Now load the segments into the area we claimed. */ - auto grub_err_t offset_phdr (Elf64_Phdr *phdr, grub_addr_t *addr); + auto grub_err_t offset_phdr (Elf64_Phdr *phdr, grub_addr_t *addr, int *do_load); grub_err_t offset_phdr (Elf64_Phdr *phdr, grub_addr_t *addr, int *do_load) { if (phdr->p_type != PT_LOAD) diff --git a/loader/sparc64/ieee1275/linux.c b/loader/sparc64/ieee1275/linux.c index d0623f347..df420d8a0 100644 --- a/loader/sparc64/ieee1275/linux.c +++ b/loader/sparc64/ieee1275/linux.c @@ -271,7 +271,7 @@ grub_linux_load64 (grub_elf_t elf) base = linux_entry - off; /* Now load the segments into the area we claimed. */ - auto grub_err_t offset_phdr (Elf64_Phdr *phdr, grub_addr_t *addr); + auto grub_err_t offset_phdr (Elf64_Phdr *phdr, grub_addr_t *addr, int *do_load); grub_err_t offset_phdr (Elf64_Phdr *phdr, grub_addr_t *addr, int *do_load) { if (phdr->p_type != PT_LOAD)