diff --git a/src/system/kernel/arch/x86/arch_cpu.cpp b/src/system/kernel/arch/x86/arch_cpu.cpp
index 632c3a26ba..c199afc81d 100644
--- a/src/system/kernel/arch/x86/arch_cpu.cpp
+++ b/src/system/kernel/arch/x86/arch_cpu.cpp
@@ -26,6 +26,7 @@
 #include <vm/VMAddressSpace.h>
 
 #include <arch_system_info.h>
+#include <arch/x86/apic.h>
 #include <arch/x86/selector.h>
 #include <boot/kernel_args.h>
 
@@ -802,6 +803,10 @@ arch_cpu_init_post_vm(kernel_args *args)
 			DT_DATA_WRITEABLE, DPL_USER);
 	}
 
+	if (!apic_available())
+		x86_init_fpu();
+	// else fpu gets set up in smp code
+
 	return B_OK;
 }
 
diff --git a/src/system/kernel/arch/x86/arch_smp.cpp b/src/system/kernel/arch/x86/arch_smp.cpp
index 55e4410f03..0720ae0bc6 100644
--- a/src/system/kernel/arch/x86/arch_smp.cpp
+++ b/src/system/kernel/arch/x86/arch_smp.cpp
@@ -73,10 +73,11 @@ i386_smp_error_interrupt(void *data)
 status_t
 arch_smp_init(kernel_args *args)
 {
-	TRACE(("arch_smp_init: entry\n"));
+	TRACE(("%s: entry\n", __func__));
 
 	if (!apic_available()) {
 		// if we don't have an apic we can't do smp
+		TRACE(("%s: apic not available for smp\n", __func__));
 		return B_OK;
 	}