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

2008-03-30 Pavel Roskin <proski@gnu.org>

Browse source 
* loader/i386/pc/multiboot2.c (grub_mb2_arch_elf64_hook): Add
	missing grub_error() call.
This commit is contained in:
proski 2008-03-30 16:17:17 +00:00
parent 0ecef90d9b
commit 9a3f3296d5
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2008-03-30 Pavel Roskin <proski@gnu.org> 2008-03-30 Pavel Roskin <proski@gnu.org>
* loader/i386/pc/multiboot2.c (grub_mb2_arch_elf64_hook): Add
missing grub_error() call.
* util/update-grub_lib.in: Define datarootdir, since Autoconf * util/update-grub_lib.in: Define datarootdir, since Autoconf
2.60 and newer uses it to define datadir. 2.60 and newer uses it to define datadir.

4
loader/i386/pc/multiboot2.c
View file

@ -44,8 +44,8 @@ grub_mb2_arch_elf64_hook (Elf64_Phdr *phdr, UNUSED grub_addr_t *addr)
if ((paddr < grub_os_area_addr) if ((paddr < grub_os_area_addr)
|| (paddr + phdr->p_memsz > grub_os_area_addr + grub_os_area_size)) || (paddr + phdr->p_memsz > grub_os_area_addr + grub_os_area_size))
return (GRUB_ERR_OUT_OF_RANGE,"Address 0x%x is out of range", return grub_error (GRUB_ERR_OUT_OF_RANGE, "Address 0x%x is out of range",
paddr); paddr);
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }