Index: kernel/generic/src/proc/scheduler.c
===================================================================
--- kernel/generic/src/proc/scheduler.c	(revision 908bb9645ed022f8ccdcdfd80a4b312d622b76e9)
+++ kernel/generic/src/proc/scheduler.c	(revision 17cc8f4f7ca39b859a63ea05d5105d4300f84a27)
@@ -92,5 +92,5 @@
 	else
 		fpu_disable();
-#else
+#elif defined CONFIG_FPU
 	fpu_enable();
 	if (THREAD->fpu_context_exists)
@@ -327,5 +327,5 @@
 		THREAD->kcycles += get_cycle() - THREAD->last_cycle;
 		
-#ifndef CONFIG_FPU_LAZY
+#if (defined CONFIG_FPU) && (!defined CONFIG_FPU_LAZY)
 		fpu_context_save(THREAD->saved_fpu_context);
 #endif