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

	* loader/i386/pc/multiboot2.c (grub_mb2_arch_elf64_hook): Add
	missing grub_error() call.

diff --git a/ChangeLog b/ChangeLog
index edf66e109f91eefed314aab6aeeed192d242f3d7..3c88328275431ec2ca316f5d482db1d2a912082e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 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
        2.60 and newer uses it to define datadir.
 

diff --git a/loader/i386/pc/multiboot2.c b/loader/i386/pc/multiboot2.c
index fdc9b24e3cfd0c9eac45c389537235cb2c457f78..58afa239956c0a5dc580751cc5aeb2e2ef36eae4 100644 (file)
--- a/loader/i386/pc/multiboot2.c
+++ b/loader/i386/pc/multiboot2.c
@@ -44,8 +44,8 @@ grub_mb2_arch_elf64_hook (Elf64_Phdr *phdr, UNUSED grub_addr_t *addr)
 
   if ((paddr < grub_os_area_addr)
       || (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",
-            paddr);
+    return grub_error (GRUB_ERR_OUT_OF_RANGE, "Address 0x%x is out of range",
+                      paddr);
 
   return GRUB_ERR_NONE;
 }