Index: src/proc/scheduler.c
===================================================================
--- src/proc/scheduler.c	(revision 0ca6faab9890ef6efb2b277aba7b8ab51cb5ba17)
+++ src/proc/scheduler.c	(revision 27dc170d4c2e2260fb8798d8d1ee4d13d15e345e)
@@ -58,5 +58,5 @@
 {
 	before_thread_runs_arch(); 
-	fpu_context_restore();
+	fpu_context_restore(&(THREAD->saved_fpu_context));
 }
 
@@ -205,4 +205,5 @@
 	if (THREAD) {
 		spinlock_lock(&THREAD->lock);
+		fpu_context_save(&(THREAD->saved_fpu_context));
 		if (!context_save(&THREAD->saved_context)) {
 			/*