Merge mainline.
This commit is contained in:
commit
90eb90e24c
263 changed files with 5295 additions and 865 deletions
|
@ -448,7 +448,7 @@ grub_multiboot_make_mbi (grub_uint32_t *target)
|
|||
bufsize = grub_multiboot_get_mbi_size ();
|
||||
|
||||
err = grub_relocator_alloc_chunk_align (grub_multiboot_relocator, &ch,
|
||||
0, 0xffffffff - bufsize,
|
||||
0x10000, 0x100000 - bufsize,
|
||||
bufsize, 4,
|
||||
GRUB_RELOCATOR_PREFERENCE_NONE);
|
||||
if (err)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue