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

Fix x86_64-efi compilation

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-01-18 12:01:13 +01:00
parent b14620812f
commit 3de254033c
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/relocator.c
View file

@ -635,9 +635,9 @@ grub_relocator_prepare_relocs (struct grub_relocator *rel, grub_addr_t addr,
struct grub_relocator_chunk *chunk; struct grub_relocator_chunk *chunk;
for (chunk = rel->chunks; chunk; chunk = chunk->next) for (chunk = rel->chunks; chunk; chunk = chunk->next)
{ {
grub_dprintf ("relocator", "chunk %p->%p, 0x%x\n", grub_dprintf ("relocator", "chunk %p->%p, 0x%lx\n",
(void *) chunk->src, (void *) chunk->target, (void *) chunk->src, (void *) chunk->target,
chunk->size); (unsigned long) chunk->size);
nchunks++; nchunks++;
count[(chunk->src & 0xff) + 1]++; count[(chunk->src & 0xff) + 1]++;
} }
@ -679,9 +679,9 @@ grub_relocator_prepare_relocs (struct grub_relocator *rel, grub_addr_t addr,
for (j = 0; j < nchunks; j++) for (j = 0; j < nchunks; j++)
{ {
grub_dprintf ("relocator", "sorted chunk %p->%p, 0x%x\n", grub_dprintf ("relocator", "sorted chunk %p->%p, 0x%lx\n",
(void *) sorted[j].src, (void *) sorted[j].target, (void *) sorted[j].src, (void *) sorted[j].target,
sorted[j].size); (unsigned long) sorted[j].size);
if (sorted[j].src < sorted[j].target) if (sorted[j].src < sorted[j].target)
{ {
grub_cpu_relocator_backward ((void *) rels, grub_cpu_relocator_backward ((void *) rels,

2
loader/i386/bsd.c
View file

@ -351,7 +351,7 @@ grub_bsd_add_mmap (void)
generate_e820_mmap (NULL, &cnt, buf); generate_e820_mmap (NULL, &cnt, buf);
grub_dprintf ("bsd", "%u entries in smap\n", cnt); grub_dprintf ("bsd", "%u entries in smap\n", (unsigned) cnt);
if (kernel_type == KERNEL_TYPE_NETBSD) if (kernel_type == KERNEL_TYPE_NETBSD)
grub_bsd_add_meta (NETBSD_BTINFO_MEMMAP, buf0, len); grub_bsd_add_meta (NETBSD_BTINFO_MEMMAP, buf0, len);
else else