[PATCH v3 10/62] arm/acpi: Move end_boot_allocator after acpi_boot_table_init
shannon.zhao at linaro.org
shannon.zhao at linaro.org
Tue Nov 17 01:40:09 PST 2015
From: Shannon Zhao <shannon.zhao at linaro.org>
If ACPI is initialized after the boot allocator has ended(the system
state is not early boot), assert happens in acpi_os_zalloc_memory and
acpi_boot_table_init will fail. So it needs to move end_boot_allocator
after acpi_boot_table_init.
Signed-off-by: Parth Dixit <parth.dixit at linaro.org>
Signed-off-by: Shannon Zhao <shannon.zhao at linaro.org>
---
xen/arch/arm/setup.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c
index 768312f..c15a09d 100644
--- a/xen/arch/arm/setup.c
+++ b/xen/arch/arm/setup.c
@@ -613,8 +613,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)
@@ -682,8 +680,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
@@ -757,6 +753,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();
--
2.1.0
More information about the linux-arm-kernel
mailing list