Index: kernel/generic/src/proc/thread.c
===================================================================
--- kernel/generic/src/proc/thread.c	(revision f651e80e2ba6968d9e184dd8ca7fa6e5b779caaf)
+++ kernel/generic/src/proc/thread.c	(revision fa024ce932aff7f238e5cabadb9fdd510c75fca9)
@@ -103,5 +103,5 @@
 
 static slab_cache_t *thread_slab;
-#ifdef ARCH_HAS_FPU
+#ifdef CONFIG_FPU
 slab_cache_t *fpu_context_slab;
 #endif
@@ -162,5 +162,5 @@
 	thr_constructor_arch(t);
 	
-#ifdef ARCH_HAS_FPU
+#ifdef CONFIG_FPU
 #ifdef CONFIG_FPU_LAZY
 	t->saved_fpu_context = NULL;
@@ -170,9 +170,9 @@
 		return -1;
 #endif
-#endif	
+#endif
 
 	t->kstack = (uint8_t *) frame_alloc(STACK_FRAMES, FRAME_KA | kmflags);
 	if (!t->kstack) {
-#ifdef ARCH_HAS_FPU
+#ifdef CONFIG_FPU
 		if (t->saved_fpu_context)
 			slab_free(fpu_context_slab, t->saved_fpu_context);
@@ -197,5 +197,5 @@
 
 	frame_free(KA2PA(t->kstack));
-#ifdef ARCH_HAS_FPU
+#ifdef CONFIG_FPU
 	if (t->saved_fpu_context)
 		slab_free(fpu_context_slab, t->saved_fpu_context);
@@ -216,5 +216,5 @@
 	    thr_constructor, thr_destructor, 0);
 
-#ifdef ARCH_HAS_FPU
+#ifdef CONFIG_FPU
 	fpu_context_slab = slab_cache_create("fpu_slab", sizeof(fpu_context_t),
 	    FPU_CONTEXT_ALIGN, NULL, NULL, 0);