vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
* loader/powerpc/ieee1275/linux.c (offset_phdr): Fix prototypes
	to match nested functions.
	* loader/sparc64/ieee1275/linux.c: Likewise.
This commit is contained in:
proski 2009-06-21 23:55:23 +00:00
parent f52196ff3a
commit c3cee41331
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,5 +1,9 @@
2009-06-21 Pavel Roskin <proski@gnu.org> 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. * conf/i386-ieee1275.rmk: Define kernel_elf_ASFLAGS.
2009-06-21 Robert Millan <rmh.grub@aybabtu.com> 2009-06-21 Robert Millan <rmh.grub@aybabtu.com>

4
loader/powerpc/ieee1275/linux.c
View file

@ -131,7 +131,7 @@ grub_linux_load32 (grub_elf_t elf)
return grub_error (GRUB_ERR_OUT_OF_MEMORY, "Could not claim memory."); return grub_error (GRUB_ERR_OUT_OF_MEMORY, "Could not claim memory.");
/* Now load the segments into the area we claimed. */ /* 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) grub_err_t offset_phdr (Elf32_Phdr *phdr, grub_addr_t *addr, int *do_load)
{ {
if (phdr->p_type != PT_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."); return grub_error (GRUB_ERR_OUT_OF_MEMORY, "Could not claim memory.");
/* Now load the segments into the area we claimed. */ /* 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) grub_err_t offset_phdr (Elf64_Phdr *phdr, grub_addr_t *addr, int *do_load)
{ {
if (phdr->p_type != PT_LOAD) if (phdr->p_type != PT_LOAD)

2
loader/sparc64/ieee1275/linux.c
View file

@ -271,7 +271,7 @@ grub_linux_load64 (grub_elf_t elf)
base = linux_entry - off; base = linux_entry - off;
/* Now load the segments into the area we claimed. */ /* 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) grub_err_t offset_phdr (Elf64_Phdr *phdr, grub_addr_t *addr, int *do_load)
{ {
if (phdr->p_type != PT_LOAD) if (phdr->p_type != PT_LOAD)