From cdfa0badfc8849ad1b7fc0188e17e2a0ede81ba9 Mon Sep 17 00:00:00 2001 From: Juergen Gross Date: Wed, 10 Dec 2014 16:56:03 +0100 Subject: [PATCH] xen: switch to post-init routines in xen mmu.c earlier With the virtual mapped linear p2m list the post-init mmu operations must be used for setting up the p2m mappings, as in case of CONFIG_FLATMEM the init routines may trigger BUGs. paging_init() sets up all infrastructure needed to switch to the post-init mmu ops done by xen_post_allocator_init(). With the virtual mapped linear p2m list we need some mmu ops during setup of this list, so we have to switch to the correct mmu ops as soon as possible. The p2m list is usable from the beginning, just expansion requires to have established the new linear mapping. So the call of xen_remap_memory() had to be introduced, but this is not due to the mmu ops requiring this. Summing it up: calling xen_post_allocator_init() not directly after paging_init() was conceptually wrong in the beginning, it just didn't matter up to now as no functions used between the two calls needed some critical mmu ops (e.g. alloc_pte). This has changed now, so I corrected it. Reported-by: Boris Ostrovsky Signed-off-by: Juergen Gross Signed-off-by: David Vrabel --- arch/x86/xen/mmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index 6ab6150c8560..a1a429a410ef 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c @@ -1225,6 +1225,7 @@ static void __init xen_pagetable_p2m_setup(void) static void __init xen_pagetable_init(void) { paging_init(); + xen_post_allocator_init(); xen_pagetable_p2m_setup(); @@ -1236,7 +1237,6 @@ static void __init xen_pagetable_init(void) xen_remap_memory(); xen_setup_shared_info(); - xen_post_allocator_init(); } static void xen_write_cr2(unsigned long cr2) { -- 2.20.1