[2356] 2009-06-21 Pavel Roskin <address@hidden>

[Pavel Roskin]

Revision: 2356
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2356
Author:   proski
Date:     2009-06-21 23:55:23 +0000 (Sun, 21 Jun 2009)
Log Message:
-----------
2009-06-21  Pavel Roskin  <address@hidden>

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

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/loader/powerpc/ieee1275/linux.c
    trunk/grub2/loader/sparc64/ieee1275/linux.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-06-21 23:53:30 UTC (rev 2355)
+++ trunk/grub2/ChangeLog       2009-06-21 23:55:23 UTC (rev 2356)
@@ -1,5 +1,9 @@
 2009-06-21  Pavel Roskin  <address@hidden>
 
+       * 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  <address@hidden>

Modified: trunk/grub2/loader/powerpc/ieee1275/linux.c
===================================================================
--- trunk/grub2/loader/powerpc/ieee1275/linux.c 2009-06-21 23:53:30 UTC (rev 
2355)
+++ trunk/grub2/loader/powerpc/ieee1275/linux.c 2009-06-21 23:55:23 UTC (rev 
2356)
@@ -131,7 +131,7 @@
     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 @@
     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)

Modified: trunk/grub2/loader/sparc64/ieee1275/linux.c
===================================================================
--- trunk/grub2/loader/sparc64/ieee1275/linux.c 2009-06-21 23:53:30 UTC (rev 
2355)
+++ trunk/grub2/loader/sparc64/ieee1275/linux.c 2009-06-21 23:55:23 UTC (rev 
2356)
@@ -271,7 +271,7 @@
   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)