Index: kernel/generic/src/proc/scheduler.c
===================================================================
--- kernel/generic/src/proc/scheduler.c	(revision c030818c76c1190836935ae3d0c05760e3582537)
+++ kernel/generic/src/proc/scheduler.c	(revision ba25c4bbca58a62473323b0e9c57e9cb14bcbf5a)
@@ -97,5 +97,5 @@
 	fpu_enable();
 	if (THREAD->fpu_context_exists)
-		fpu_context_restore(THREAD->saved_fpu_context);
+		fpu_context_restore(&THREAD->fpu_context);
 	else {
 		fpu_init();
@@ -140,5 +140,5 @@
 	if (CPU->fpu_owner != NULL) {
 		irq_spinlock_lock(&CPU->fpu_owner->lock, false);
-		fpu_context_save(CPU->fpu_owner->saved_fpu_context);
+		fpu_context_save(&CPU->fpu_owner->fpu_context);
 
 		/* Don't prevent migration */
@@ -150,5 +150,5 @@
 	irq_spinlock_lock(&THREAD->lock, false);
 	if (THREAD->fpu_context_exists) {
-		fpu_context_restore(THREAD->saved_fpu_context);
+		fpu_context_restore(&THREAD->fpu_context);
 	} else {
 		fpu_init();
@@ -325,5 +325,5 @@
 
 #if (defined CONFIG_FPU) && (!defined CONFIG_FPU_LAZY)
-		fpu_context_save(THREAD->saved_fpu_context);
+		fpu_context_save(&THREAD->fpu_context);
 #endif
 		if (!context_save(&THREAD->saved_context)) {