diff --git a/hypervisor/arch/x86/cpu.c b/hypervisor/arch/x86/cpu.c
index 1f9b51927..512ec916e 100644
--- a/hypervisor/arch/x86/cpu.c
+++ b/hypervisor/arch/x86/cpu.c
@@ -160,6 +160,8 @@ void init_cpu_post(uint16_t pcpu_id)
 			pr_fatal("Please apply the latest CPU uCode patch!");
 		}
 
+		init_scheduler();
+
 		/* Initialize interrupts */
 		interrupt_init(BOOT_CPU_ID);
 
diff --git a/hypervisor/arch/x86/init.c b/hypervisor/arch/x86/init.c
index 29950eb57..dae326b40 100644
--- a/hypervisor/arch/x86/init.c
+++ b/hypervisor/arch/x86/init.c
@@ -50,12 +50,6 @@ static void init_passthru(void)
 	ptdev_init();
 }
 
-/*TODO: move into guest-vcpu module */
-static void init_guest(void)
-{
-	init_scheduler();
-}
-
 /*TODO: move into guest-vcpu module */
 static void enter_guest_mode(uint16_t pcpu_id)
 {
@@ -82,8 +76,6 @@ static void init_primary_cpu_post(void)
 
 	init_debug_pre();
 
-	init_guest();
-
 	init_cpu_post(BOOT_CPU_ID);
 
 	init_debug_post(BOOT_CPU_ID);