From 56d619ed8b2f43cf2beb817b0026017b4b9a7713 Mon Sep 17 00:00:00 2001
From: Brian Gerst <brgerst@gmail.com>
Date: Fri, 3 Sep 2010 21:17:13 -0400
Subject: [PATCH] --- yaml --- r: 212039 b: refs/heads/master c:
 10c11f304986a1f84201c2261a428701f9d2dffc h: refs/heads/master i:   212037:
 006c310e41fd0ea0f5328116de01d42e3bbd5f70   212035:
 2242077759267109b4579bfd7153e51af9a7ffe0   212031:
 ec08ebc390eb06b9702d876c5caaa04396feed1d v: v3

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

diff --git a/[refs] b/[refs]
index b8e29daa0c45..f60336fea3c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a4d4fbc7735bba6654b20f859135f9d3f8fe7f76
+refs/heads/master: 10c11f304986a1f84201c2261a428701f9d2dffc
diff --git a/trunk/arch/x86/kernel/i387.c b/trunk/arch/x86/kernel/i387.c
index 82166519497a..f3775f5ef4ab 100644
--- a/trunk/arch/x86/kernel/i387.c
+++ b/trunk/arch/x86/kernel/i387.c
@@ -389,19 +389,17 @@ convert_from_fxsr(struct user_i387_ia32_struct *env, struct task_struct *tsk)
 #ifdef CONFIG_X86_64
 	env->fip = fxsave->rip;
 	env->foo = fxsave->rdp;
+	/*
+	 * should be actually ds/cs at fpu exception time, but
+	 * that information is not available in 64bit mode.
+	 */
+	env->fcs = task_pt_regs(tsk)->cs;
 	if (tsk == current) {
-		/*
-		 * should be actually ds/cs at fpu exception time, but
-		 * that information is not available in 64bit mode.
-		 */
-		asm("mov %%ds, %[fos]" : [fos] "=r" (env->fos));
-		asm("mov %%cs, %[fcs]" : [fcs] "=r" (env->fcs));
+		savesegment(ds, env->fos);
 	} else {
-		struct pt_regs *regs = task_pt_regs(tsk);
-
-		env->fos = 0xffff0000 | tsk->thread.ds;
-		env->fcs = regs->cs;
+		env->fos = tsk->thread.ds;
 	}
+	env->fos |= 0xffff0000;
 #else
 	env->fip = fxsave->fip;
 	env->fcs = (u16) fxsave->fcs | ((u32) fxsave->fop << 16);