From 340cf8545eedd0478855f590b11dec539625a1ef Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Mon, 10 May 2010 13:37:16 -0700
Subject: [PATCH] --- yaml --- r: 191507 b: refs/heads/master c:
 c3f8978ea332cd4be88e12574452a025892ac9af h: refs/heads/master i:   191505:
 e445e830d88324ecd10e586b9eb38c495ccb869e   191503:
 959c5a301fde9f188c9ad5a04fa0c9e4756780f7 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/x86/math-emu/fpu_aux.c    | 2 +-
 trunk/arch/x86/math-emu/fpu_entry.c  | 4 ++--
 trunk/arch/x86/math-emu/fpu_system.h | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 5fce657b39ad..16b29c3d2e9f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86603283326c9e95e5ad4e9fdddeec93cac5d9ad
+refs/heads/master: c3f8978ea332cd4be88e12574452a025892ac9af
diff --git a/trunk/arch/x86/math-emu/fpu_aux.c b/trunk/arch/x86/math-emu/fpu_aux.c
index 62797f930511..dc8adad10a2f 100644
--- a/trunk/arch/x86/math-emu/fpu_aux.c
+++ b/trunk/arch/x86/math-emu/fpu_aux.c
@@ -52,7 +52,7 @@ void finit_soft_fpu(struct i387_soft_struct *soft)
 
 void finit(void)
 {
-	finit_task(&current->thread.fpu);
+	finit_soft_fpu(&current->thread.fpu.state->soft);
 }
 
 /*
diff --git a/trunk/arch/x86/math-emu/fpu_entry.c b/trunk/arch/x86/math-emu/fpu_entry.c
index 5d87f586f8d7..7718541541d4 100644
--- a/trunk/arch/x86/math-emu/fpu_entry.c
+++ b/trunk/arch/x86/math-emu/fpu_entry.c
@@ -681,7 +681,7 @@ int fpregs_soft_set(struct task_struct *target,
 		    unsigned int pos, unsigned int count,
 		    const void *kbuf, const void __user *ubuf)
 {
-	struct i387_soft_struct *s387 = &target->thread.xstate->soft;
+	struct i387_soft_struct *s387 = &target->thread.fpu.state->soft;
 	void *space = s387->st_space;
 	int ret;
 	int offset, other, i, tags, regnr, tag, newtop;
@@ -733,7 +733,7 @@ int fpregs_soft_get(struct task_struct *target,
 		    unsigned int pos, unsigned int count,
 		    void *kbuf, void __user *ubuf)
 {
-	struct i387_soft_struct *s387 = &target->thread.xstate->soft;
+	struct i387_soft_struct *s387 = &target->thread.fpu.state->soft;
 	const void *space = s387->st_space;
 	int ret;
 	int offset = (S387->ftop & 7) * 10, other = 80 - offset;
diff --git a/trunk/arch/x86/math-emu/fpu_system.h b/trunk/arch/x86/math-emu/fpu_system.h
index 50fa0ec2c8a5..2c614410a5f3 100644
--- a/trunk/arch/x86/math-emu/fpu_system.h
+++ b/trunk/arch/x86/math-emu/fpu_system.h
@@ -31,7 +31,7 @@
 #define SEG_EXPAND_DOWN(s)	(((s).b & ((1 << 11) | (1 << 10))) \
 				 == (1 << 10))
 
-#define I387			(current->thread.xstate)
+#define I387			(current->thread.fpu.state)
 #define FPU_info		(I387->soft.info)
 
 #define FPU_CS			(*(unsigned short *) &(FPU_info->regs->cs))