| Message ID | 1456467780-8476-6-git-send-email-zhaoshenglong@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, 26 Feb 2016, Shannon Zhao wrote: > From: Shannon Zhao <shannon.zhao@linaro.org> > > 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 <parth.dixit@linaro.org> > Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org> Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> > V5: fix the commit message > --- > 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 fee5385..d4261e8 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(); > > -- > 2.0.4 > >
diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index fee5385..d4261e8 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();