From: David Woodhouse <d...@amazon.co.uk> We would like to be able to use vmap() to map the live update data, and we need to do a first pass of the live update data before we prime the heap because we need to know which pages need to be preserved.
Signed-off-by: David Woodhouse <d...@amazon.co.uk> --- xen/arch/x86/setup.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index dba8c3f0a1..ea3f423b4c 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1572,6 +1572,8 @@ void __init noreturn __start_xen(unsigned long mbi_p) numa_initmem_init(0, raw_max_page); + vm_init(); + if ( lu_bootmem_start ) { unsigned long limit = virt_to_mfn(HYPERVISOR_VIRT_END - 1); @@ -1635,12 +1637,6 @@ void __init noreturn __start_xen(unsigned long mbi_p) end_boot_allocator(); system_state = SYS_STATE_boot; - /* - * No calls involving ACPI code should go between the setting of - * SYS_STATE_boot and vm_init() (or else acpi_os_{,un}map_memory() - * will break). - */ - vm_init(); console_init_ring(); vesa_init(); -- 2.21.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel