Index: arch/ia32/src/fpu_context.c
===================================================================
--- arch/ia32/src/fpu_context.c	(revision 5eb13795833c0c2770752833341011853de2b574)
+++ arch/ia32/src/fpu_context.c	(revision 005384ad95744d08b0ce1d6d971b7af3df1e9611)
@@ -39,9 +39,10 @@
 void fpu_context_restore(fpu_context_t *fctx)
 {
-	if(THREAD==CPU->fpu_owner) {reset_TS_flag(); }
-	else 
-	{
+	if (THREAD==CPU->fpu_owner) 
+		reset_TS_flag();
+	else {
 		set_TS_flag(); 
-		if((CPU->fpu_owner)!=NULL)(CPU->fpu_owner)->fpu_context_engaged=1;
+		if (CPU->fpu_owner != NULL)
+			(CPU->fpu_owner)->fpu_context_engaged=1;
 	}
 }
@@ -50,23 +51,23 @@
 void fpu_lazy_context_save(fpu_context_t *fctx)
 {
+	__asm__ volatile (
+		"fnsave %0"
+		: "=m"(*fctx)
+		);
 	return;
-	__asm__ (
-		"fnsave %0"
-		: "=m"(fctx)
-		);
 }
 
 void fpu_lazy_context_restore(fpu_context_t *fctx)
 {
+	__asm__ volatile (
+		"frstor %0"
+		: "=m"(*fctx)
+		);
 	return;
-	__asm__ (
-		"frstor %0"
-		: "=m"(fctx)
-		);
 }
 
 void fpu_init(void)
 {
-	asm(
+	__asm__ volatile (
 		"fninit;"
 	);
Index: arch/ia32/src/interrupt.c
===================================================================
--- arch/ia32/src/interrupt.c	(revision 5eb13795833c0c2770752833341011853de2b574)
+++ arch/ia32/src/interrupt.c	(revision 005384ad95744d08b0ce1d6d971b7af3df1e9611)
@@ -111,10 +111,14 @@
 {
 	reset_TS_flag();
-	if ((CPU->fpu_owner)!=NULL) {  
+	if (CPU->fpu_owner != NULL) {  
 		fpu_lazy_context_save(&((CPU->fpu_owner)->saved_fpu_context));
-		(CPU->fpu_owner)->fpu_context_engaged=0; /* don't prevent migration */
+		CPU->fpu_owner->fpu_context_engaged=0; /* don't prevent migration */
 	}
-	if(THREAD->fpu_context_exists) fpu_lazy_context_restore(&(THREAD->saved_fpu_context));
-	else {fpu_init();THREAD->fpu_context_exists=1;}
+	if (THREAD->fpu_context_exists) 
+		fpu_lazy_context_restore(&(THREAD->saved_fpu_context));
+	else {
+		fpu_init();
+		THREAD->fpu_context_exists=1;
+	}
 	CPU->fpu_owner=THREAD;
 }