From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Mon, 6 Jan 2025 06:36:34 +0000 (+0000)
Subject: x86/traps: Move cpu_init() out of trap_init()
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f986cf2b5273f57fe446d2d88aed4e13b6b197c7;p=people%2Fandrewcoop%2Fxen.git

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

diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index 143749e5da..ec3fb08800 100644
--- 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 e4ffc9843c..257a150555 100644
--- 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)