Merge commit 'v2.6.28-rc2' into core/locking

Conflicts:
	arch/um/include/asm/system.h

1 files changed, 2 insertions, 1 deletions

diff --git a/arch/um/sys-i386/signal.c b/arch/um/sys-i386/signal.c
index fd0c25ad6af3..129647375a6c 100644
--- a/arch/um/sys-i386/signal.c
+++ b/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;