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

Merge branch 'gnu' into sync

Browse source
This commit is contained in:
David Michael 2017-04-27 12:05:22 -07:00
commit f89e1cf69a
63 changed files with 884 additions and 310 deletions
Download patch file Download diff file Expand all files Collapse all files

4
grub-core/loader/i386/xen.c
View file

@ -419,8 +419,6 @@ grub_xen_pt_alloc (void)
try_virt_end = ALIGN_UP (xen_state.xen_inf.virt_base +
page2offset (nr_need_pages) +
ADDITIONAL_SIZE + STACK_SIZE, ALIGN_SIZE);
if (!xen_state.xen_inf.virt_base)
try_virt_end += PAGE_SIZE;
err = get_pgtable_size (xen_state.xen_inf.virt_base, try_virt_end,
nr_info_pages);
@ -433,7 +431,7 @@ grub_xen_pt_alloc (void)
if (xen_state.xen_inf.virt_base)
err = get_pgtable_size (0, PAGE_SIZE, nr_need_pages);
else
err = get_pgtable_size (try_virt_end - PAGE_SIZE, try_virt_end,
err = get_pgtable_size (try_virt_end, try_virt_end + PAGE_SIZE,
nr_need_pages);
if (err)
return err;