Merge branch 'for-rmk' of git://git.android.com/kernel into devel

2 files changed, 4 insertions, 1 deletions

diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 6976812cfb18..393bccfe1785 100644
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -229,6 +229,8 @@ endmenu
 
 source "init/Kconfig"
 
+source "kernel/Kconfig.freezer"
+
 source "drivers/block/Kconfig"
 
 source "arch/um/Kconfig.char"
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;