diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
index b391b7ade4..ac253922ae 100644
--- a/arch/x86/cpu/cpu.c
+++ b/arch/x86/cpu/cpu.c
@@ -322,8 +322,6 @@ int x86_cpu_init_f(void)
 
 int x86_cpu_init_r(void)
 {
-	/* Initialize core interrupt and exception functionality of CPU */
-	cpu_init_interrupts();
 	return 0;
 }
 int cpu_init_r(void) __attribute__((weak, alias("x86_cpu_init_r")));
diff --git a/arch/x86/lib/pcat_interrupts.c b/arch/x86/lib/pcat_interrupts.c
index 2dc2fbd55b..f388db2276 100644
--- a/arch/x86/lib/pcat_interrupts.c
+++ b/arch/x86/lib/pcat_interrupts.c
@@ -65,6 +65,9 @@ int interrupt_init(void)
 	/* Interrupt 9 should be level triggered (SCI). The OS might do this */
 	configure_irq_trigger(9, true);
 
+	/* Initialize core interrupt and exception functionality of CPU */
+	cpu_init_interrupts();
+
 	enable_interrupts();
 
 	return 0;