x86/traps: Move cpu_init() out of trap_init()

diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index 143749e5da5bae83fca719fc8ff9d506254d6ea2..ec3fb08800465f2b7d0f147d77e5df3bdcbe1ac9 100644 (file)
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -2017,6 +2017,8 @@ void asmlinkage __init noreturn __start_xen(void)
 
     trap_init();
 
+    cpu_init();
+
     rcu_init();
 
     early_time_init();

diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c
index e4ffc9843ca7bfb5a5b1ed7c84923fa4a3827df6..257a15055568d2919fae39775fcbfba6f5da3e01 100644 (file)
--- a/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@ -1936,8 +1936,6 @@ void __init trap_init(void)
             l1e_from_pfn(virt_to_mfn(boot_compat_gdt), __PAGE_HYPERVISOR_RW);
 
     percpu_traps_init();
-
-    cpu_init();
 }
 
 void asm_domain_crash_synchronous(unsigned long addr)