From b5ee5b1e2dd946a68e60749de37cfe8f91572bf2 Mon Sep 17 00:00:00 2001
From: WANG Cong <wangcong@zeuux.org>
Date: Sat, 18 Oct 2008 20:27:26 -0700
Subject: [PATCH] --- yaml --- r: 115888 b: refs/heads/master c:
 966c8079c0eae66242692184982dc70671dbe90f h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/um/sys-i386/signal.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 586314f5e2cc..9fc4c5a245d2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d12a6f7f913afb2c6f5de44cbac1bb7232a03175
+refs/heads/master: 966c8079c0eae66242692184982dc70671dbe90f
diff --git a/trunk/arch/um/sys-i386/signal.c b/trunk/arch/um/sys-i386/signal.c
index fd0c25ad6af3..129647375a6c 100644
--- a/trunk/arch/um/sys-i386/signal.c
+++ b/trunk/arch/um/sys-i386/signal.c
@@ -179,7 +179,8 @@ static int copy_sc_from_user(struct pt_regs *regs,
 	if (have_fpx_regs) {
 		struct user_fxsr_struct fpx;
 
-		err = copy_from_user(&fpx, &sc.fpstate->_fxsr_env[0],
+		err = copy_from_user(&fpx,
+			&((struct _fpstate __user *)sc.fpstate)->_fxsr_env[0],
 				     sizeof(struct user_fxsr_struct));
 		if (err)
 			return 1;