Index: kernel/arch/amd64/src/amd64.c
===================================================================
--- kernel/arch/amd64/src/amd64.c	(revision 29b2bbf5311052c0b1ad8971cfac6843f0ef6a1b)
+++ kernel/arch/amd64/src/amd64.c	(revision 7dcf22a389ae4373e29fc2686bf9bae2ac3a8d39)
@@ -45,4 +45,8 @@
 #include <arch/drivers/i8254.h>
 #include <arch/drivers/i8259.h>
+
+#ifdef CONFIG_SMP
+#include <arch/smp/apic.h>
+#endif
 
 #include <arch/bios/bios.h>
@@ -157,4 +161,14 @@
 }
 
+void arch_post_cpu_init()
+{
+#ifdef CONFIG_SMP
+	if (config.cpu_active > 1) {
+		l_apic_init();
+		l_apic_debug();
+	}
+#endif
+}
+
 void arch_pre_smp_init(void)
 {