2 files changed, 15 insertions, 17 deletions

diff --git a/arch/um/sys-i386/ptrace.c b/arch/um/sys-i386/ptrace.c
index 6b4499906a6c..c9b176534d65 100644
--- a/arch/um/sys-i386/ptrace.c
+++ b/arch/um/sys-i386/ptrace.c
@@ -148,14 +148,13 @@ int peek_user(struct task_struct *child, long addr, long data)
 int get_fpregs(struct user_i387_struct __user *buf, struct task_struct *child)
 {
         int err, n, cpu = ((struct thread_info *) child->stack)->cpu;
-        long fpregs[HOST_FP_SIZE];
+        struct user_i387_struct fpregs;
 
-        BUG_ON(sizeof(*buf) != sizeof(fpregs));
-        err = save_fp_registers(userspace_pid[cpu], fpregs);
+        err = save_fp_registers(userspace_pid[cpu], (unsigned long *) &fpregs);
         if (err)
                 return err;
 
-        n = copy_to_user(buf, fpregs, sizeof(fpregs));
+        n = copy_to_user(buf, &fpregs, sizeof(fpregs));
         if(n > 0)
                 return -EFAULT;
 
@@ -165,27 +164,26 @@ int get_fpregs(struct user_i387_struct __user *buf, struct task_struct *child)
 int set_fpregs(struct user_i387_struct __user *buf, struct task_struct *child)
 {
         int n, cpu = ((struct thread_info *) child->stack)->cpu;
-        long fpregs[HOST_FP_SIZE];
+        struct user_i387_struct fpregs;
 
-        BUG_ON(sizeof(*buf) != sizeof(fpregs));
-        n = copy_from_user(fpregs, buf, sizeof(fpregs));
+        n = copy_from_user(&fpregs, buf, sizeof(fpregs));
         if (n > 0)
                 return -EFAULT;
 
-        return restore_fp_registers(userspace_pid[cpu], fpregs);
+        return restore_fp_registers(userspace_pid[cpu],
+                                    (unsigned long *) &fpregs);
 }
 
 int get_fpxregs(struct user_fxsr_struct __user *buf, struct task_struct *child)
 {
         int err, n, cpu = ((struct thread_info *) child->stack)->cpu;
-        long fpregs[HOST_XFP_SIZE];
+        struct user_fxsr_struct fpregs;
 
-        BUG_ON(sizeof(*buf) != sizeof(fpregs));
-        err = save_fpx_registers(userspace_pid[cpu], fpregs);
+        err = save_fpx_registers(userspace_pid[cpu], (unsigned long *) &fpregs);
         if (err)
                 return err;
 
-        n = copy_to_user(buf, fpregs, sizeof(fpregs));
+        n = copy_to_user(buf, &fpregs, sizeof(fpregs));
         if(n > 0)
                 return -EFAULT;
 
@@ -195,14 +193,14 @@ int get_fpxregs(struct user_fxsr_struct __user *buf, struct task_struct *child)
 int set_fpxregs(struct user_fxsr_struct __user *buf, struct task_struct *child)
 {
         int n, cpu = ((struct thread_info *) child->stack)->cpu;
-        long fpregs[HOST_XFP_SIZE];
+        struct user_fxsr_struct fpregs;
 
-        BUG_ON(sizeof(*buf) != sizeof(fpregs));
-        n = copy_from_user(fpregs, buf, sizeof(fpregs));
+        n = copy_from_user(&fpregs, buf, sizeof(fpregs));
         if (n > 0)
                 return -EFAULT;
 
-        return restore_fpx_registers(userspace_pid[cpu], fpregs);
+        return restore_fpx_registers(userspace_pid[cpu],
+                                     (unsigned long *) &fpregs);
 }
 
 long subarch_ptrace(struct task_struct *child, long request, long addr,
diff --git a/arch/um/sys-i386/user-offsets.c b/arch/um/sys-i386/user-offsets.c
index 39bd32bf84f0..5f883bfe773f 100644
--- a/arch/um/sys-i386/user-offsets.c
+++ b/arch/um/sys-i386/user-offsets.c
@@ -22,7 +22,7 @@ void foo(void)
         OFFSET(HOST_SC_CR2, sigcontext, cr2);
 
         DEFINE_LONGS(HOST_FP_SIZE, sizeof(struct user_fpregs_struct));
-        DEFINE_LONGS(HOST_XFP_SIZE, sizeof(struct user_fpxregs_struct));
+        DEFINE_LONGS(HOST_FPX_SIZE, sizeof(struct user_fpxregs_struct));
 
         DEFINE(HOST_IP, EIP);
         DEFINE(HOST_SP, UESP);