[Xen-changelog] [xen master] x86: undo vm_init() movement from 1a6e3220cc

[patchbot@xxxxxxx]

commit 95c19287580c04c8abd0a0e0bc81d9bec32971a5
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Thu Feb 2 15:46:17 2017 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Thu Feb 2 15:46:17 2017 +0100

    x86: undo vm_init() movement from 1a6e3220cc
    
    There must not be any alloc_xen_pagetable() calls between
    end_boot_allocator() and the setting of SYS_STATE_boot.
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
---
 xen/arch/x86/setup.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index ccfd6dd..176ee74 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -1376,9 +1376,13 @@ void __init noreturn __start_xen(unsigned long mbi_p)
     else
         end_boot_allocator();
 
-    vm_init();
-
     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();
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog