2009-06-21 Pavel Roskin <proski@gnu.org>

	* loader/powerpc/ieee1275/linux.c (offset_phdr): Fix prototypes
	to match nested functions.
	* loader/sparc64/ieee1275/linux.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index bef575951d817329858fe808db315d2fa5c36313..2b1e27340fb725b07a85fa67474a0d0306514b3e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-06-21  Pavel Roskin  <proski@gnu.org>
 
+       * 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  <rmh.grub@aybabtu.com>

diff --git a/loader/powerpc/ieee1275/linux.c b/loader/powerpc/ieee1275/linux.c
index f183c86255a2634b7d7e2ad4164445c404983ec6..79fbf0b02545a03f23316df022309a97ff65a056 100644 (file)
--- 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 d0623f3475e4cb14d69efbdabd298fa9fea1309d..df420d8a0d4f0070117218189c0936b248c5bd6d 100644 (file)
--- 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)