diff --git a/ChangeLog b/ChangeLog index 756fd3238..b9bd3ca54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2008-07-16 Pavel Roskin + * loader/i386/efi/linux.c (allocate_pages): Fix warnings in + format strings. + * util/i386/efi/grub-mkimage.c (get_target_address): Return a pointer, not an integer. This fixes a warning and prevents precision loss on 64-bit systems. diff --git a/loader/i386/efi/linux.c b/loader/i386/efi/linux.c index ee3fb9967..946f56276 100644 --- a/loader/i386/efi/linux.c +++ b/loader/i386/efi/linux.c @@ -168,7 +168,7 @@ allocate_pages (grub_size_t real_size, grub_size_t prot_size) prot_size = page_align (prot_size); mmap_size = find_mmap_size (); - grub_dprintf ("linux", "real_size = %x, prot_size = %x, mmap_size = %x\n", + grub_dprintf ("linux", "real_size = %x, prot_size = %x, mmap_size = %lx\n", real_size, prot_size, mmap_size); /* Calculate the number of pages; Combine the real mode code with @@ -217,7 +217,7 @@ allocate_pages (grub_size_t real_size, grub_size_t prot_size) if (addr < 0x10000) continue; - grub_dprintf ("linux", "trying to allocate %u pages at %x\n", + grub_dprintf ("linux", "trying to allocate %lu pages at %x\n", real_mode_pages, (unsigned) addr); real_mode_mem = grub_efi_allocate_pages (addr, real_mode_pages); if (! real_mode_mem)