From c81a9835e44b59bce4f0dafd3b1a6082a983587a Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Mon, 6 Jan 2025 06:36:34 +0000 Subject: [PATCH] x86/traps: Move cpu_init() out of trap_init() cpu_init() doesn't particularly belong in trap_init(). This brings the BSP more in line with the APs. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/setup.c | 2 ++ xen/arch/x86/traps.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 715719213d..5daa70fc0f 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -2024,6 +2024,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 df1155bfb6..a89f4f4f34 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1938,8 +1938,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)