From: Shannon Zhao Date: Wed, 2 Mar 2016 07:38:00 +0000 (+0100) Subject: arm/acpi: Move end_boot_allocator after acpi_boot_table_init X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~1608 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=827543c0ce14b5fe947b38ff72fa337e6485e050;p=xen.git arm/acpi: Move end_boot_allocator after acpi_boot_table_init To support ACPI NUMA, it needs to make the ACPI initialization done before boot_end_allocator. Also, x86 does this by the same way. Signed-off-by: Parth Dixit Signed-off-by: Shannon Zhao Reviewed-by: Stefano Stabellini --- diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index fee5385868..d4261e83c2 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -615,8 +615,6 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) allocator. */ init_xenheap_pages(pfn_to_paddr(xenheap_mfn_start), pfn_to_paddr(boot_mfn_start)); - - end_boot_allocator(); } #else /* CONFIG_ARM_64 */ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) @@ -684,8 +682,6 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) setup_frametable_mappings(ram_start, ram_end); max_page = PFN_DOWN(ram_end); - - end_boot_allocator(); } #endif @@ -759,6 +755,8 @@ void __init start_xen(unsigned long boot_phys_offset, /* Parse the ACPI tables for possible boot-time configuration */ acpi_boot_table_init(); + end_boot_allocator(); + vm_init(); dt_unflatten_host_device_tree();