From 9a3f3296d5c8cd56114ffd6767f9b24a33ea6917 Mon Sep 17 00:00:00 2001 From: proski Date: Sun, 30 Mar 2008 16:17:17 +0000 Subject: [PATCH] 2008-03-30 Pavel Roskin * loader/i386/pc/multiboot2.c (grub_mb2_arch_elf64_hook): Add missing grub_error() call. --- ChangeLog | 3 +++ loader/i386/pc/multiboot2.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index edf66e109..3c8832827 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2008-03-30 Pavel Roskin + * 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 fdc9b24e3..58afa2399 100644 --- 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; }