From a13f7592608c64eab62508739da98fa8ed46063f Mon Sep 17 00:00:00 2001
From: Jan Beulich <jbeulich@novell.com>
Date: Wed, 5 Mar 2008 08:35:14 +0000
Subject: [PATCH] --- yaml --- r: 87025 b: refs/heads/master c:
 609b5297bcfb7b39b7a4137e9ec48407a8c96763 h: refs/heads/master i:   87023:
 c47fe67e616eeb32c7cb99021e1b3556bd88c7d1 v: v3

---
 [refs]                       | 2 +-
 trunk/arch/x86/kernel/i387.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2588c014b00a..341bb7573988 100644
--- 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
index 60fe80157569..d2e39e69aaf8 100644
--- 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