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

2008-07-16 Pavel Roskin <proski@gnu.org>

Browse source 
* loader/i386/efi/linux.c (allocate_pages): Fix warnings in
	format strings.
This commit is contained in:
proski 2008-07-16 07:06:11 +00:00
parent 59652a208f
commit ef29405511
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-07-16 Pavel Roskin <proski@gnu.org> 2008-07-16 Pavel Roskin <proski@gnu.org>
* loader/i386/efi/linux.c (allocate_pages): Fix warnings in
format strings.
* util/i386/efi/grub-mkimage.c (get_target_address): Return a * util/i386/efi/grub-mkimage.c (get_target_address): Return a
pointer, not an integer. This fixes a warning and prevents pointer, not an integer. This fixes a warning and prevents
precision loss on 64-bit systems. precision loss on 64-bit systems.

4
loader/i386/efi/linux.c
View file

@ -168,7 +168,7 @@ allocate_pages (grub_size_t real_size, grub_size_t prot_size)
prot_size = page_align (prot_size); prot_size = page_align (prot_size);
mmap_size = find_mmap_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); real_size, prot_size, mmap_size);
/* Calculate the number of pages; Combine the real mode code with /* 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) if (addr < 0x10000)
continue; 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_pages, (unsigned) addr);
real_mode_mem = grub_efi_allocate_pages (addr, real_mode_pages); real_mode_mem = grub_efi_allocate_pages (addr, real_mode_pages);
if (! real_mode_mem) if (! real_mode_mem)