* grub-core/kern/ieee1275/init.c (grub_claim_heap): Improve handling
of GRUB_IEEE1275_FLAG_FORCE_CLAIM. * grub-core/loader/powerpc/ieee1275/linux.c (grub_linux_claimmap_iterate): Handle GRUB_IEEE1275_FLAG_FORCE_CLAIM.
This commit is contained in:
parent
f32555dd93
commit
90ec4b7f6c
5 changed files with 34 additions and 4 deletions
|
@ -111,6 +111,20 @@ grub_linux_claimmap_iterate (grub_addr_t target, grub_size_t size,
|
|||
.found_addr = (grub_addr_t) -1
|
||||
};
|
||||
|
||||
if (grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_FORCE_CLAIM))
|
||||
{
|
||||
grub_uint64_t addr = target;
|
||||
if (addr < GRUB_IEEE1275_STATIC_HEAP_START
|
||||
+ GRUB_IEEE1275_STATIC_HEAP_LEN)
|
||||
addr = GRUB_IEEE1275_STATIC_HEAP_START
|
||||
+ GRUB_IEEE1275_STATIC_HEAP_LEN;
|
||||
addr = ALIGN_UP (addr, align);
|
||||
if (grub_claimmap (addr, size) == GRUB_ERR_NONE)
|
||||
return addr;
|
||||
return (grub_addr_t) -1;
|
||||
}
|
||||
|
||||
|
||||
grub_machine_mmap_iterate (alloc_mem, &ctx);
|
||||
|
||||
return ctx.found_addr;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue