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

fix warnings on x86_64

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-05-04 17:25:29 +02:00
parent c3a4565068
commit 4e75dd1212
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/relocator.c
View file

@ -201,9 +201,10 @@ allocate_inreg (grub_phys_addr_t paddr, grub_size_t size,
struct grub_mm_header *foll = NULL; struct grub_mm_header *foll = NULL;
grub_addr_t vaddr = (grub_addr_t) hb + (paddr - grub_vtop (hb)); grub_addr_t vaddr = (grub_addr_t) hb + (paddr - grub_vtop (hb));
grub_dprintf ("relocator", grub_dprintf ("relocator", "inreg paddr = 0x%lx, size = %lu,"
"inreg paddr = 0x%x, size = %d, hb = %p, hbp = %p, rb = %p, vaddr = 0x%x\n", " hb = %p, hbp = %p, rb = %p, vaddr = 0x%lx\n",
paddr, size, hb, hbp, rb, vaddr); (unsigned long) paddr, (unsigned long) size, hb, hbp,
rb, (unsigned long) vaddr);
if (ALIGN_UP (vaddr + size, GRUB_MM_ALIGN) + GRUB_MM_ALIGN if (ALIGN_UP (vaddr + size, GRUB_MM_ALIGN) + GRUB_MM_ALIGN
<= (grub_addr_t) (hb + hb->size)) <= (grub_addr_t) (hb + hb->size))
@ -211,8 +212,8 @@ allocate_inreg (grub_phys_addr_t paddr, grub_size_t size,
foll = (void *) ALIGN_UP (vaddr + size, GRUB_MM_ALIGN); foll = (void *) ALIGN_UP (vaddr + size, GRUB_MM_ALIGN);
foll->magic = GRUB_MM_FREE_MAGIC; foll->magic = GRUB_MM_FREE_MAGIC;
foll->size = hb + hb->size - foll; foll->size = hb + hb->size - foll;
grub_dprintf ("relocator", "foll = %p, foll->size = %d\n", foll, grub_dprintf ("relocator", "foll = %p, foll->size = %lu\n", foll,
foll->size); (unsigned long) foll->size);
} }
if (vaddr - (grub_addr_t) hb >= sizeof (*hb)) if (vaddr - (grub_addr_t) hb >= sizeof (*hb))