---

yaml --- r: 87025 b: refs/heads/master c: 609b529 h: refs/heads/master i: 87023: c47fe67 v: v3
git-mirror · Mar 7, 2008 · a13f759 · a13f759
1 parent 20870ff
commit a13f759
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e40cd10ccff3d9fbffd57b93780bee4b7b9bff51
+refs/heads/master: 609b5297bcfb7b39b7a4137e9ec48407a8c96763
diff --git a/trunk/arch/x86/kernel/i387.c b/trunk/arch/x86/kernel/i387.c
@@ -261,7 +261,7 @@ static void convert_from_fxsr(struct user_i387_ia32_struct *env,
 	}
 #else
 	env->fip = fxsave->fip;
-	env->fcs = fxsave->fcs;
+	env->fcs = (u16) fxsave->fcs | ((u32) fxsave->fop << 16);
 	env->foo = fxsave->foo;
 	env->fos = fxsave->fos;
 #endif