Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

2 files changed, 7 insertions, 6 deletions

diff --git a/arch/um/sys-x86_64/asm/elf.h b/arch/um/sys-x86_64/asm/elf.h
index d760967f33a7..d6d5af376251 100644
--- a/arch/um/sys-x86_64/asm/elf.h
+++ b/arch/um/sys-x86_64/asm/elf.h
@@ -95,6 +95,8 @@ typedef struct user_i387_struct elf_fpregset_t;
         (pr_reg)[25] = 0;                                       \
         (pr_reg)[26] = 0;
 
+#define task_pt_regs(t) (&(t)->thread.regs)
+
 struct task_struct;
 
 extern int elf_core_copy_fpregs(struct task_struct *t, elf_fpregset_t *fpu);
diff --git a/arch/um/sys-x86_64/ptrace.c b/arch/um/sys-x86_64/ptrace.c
index f3458d7d1c5a..f43613643cdb 100644
--- a/arch/um/sys-x86_64/ptrace.c
+++ b/arch/um/sys-x86_64/ptrace.c
@@ -175,19 +175,18 @@ int set_fpregs(struct user_i387_struct __user *buf, struct task_struct *child)
         return restore_fp_registers(userspace_pid[cpu], fpregs);
 }
 
-long subarch_ptrace(struct task_struct *child, long request, long addr,
-                    long data)
+long subarch_ptrace(struct task_struct *child, long request,
+                    unsigned long addr, unsigned long data)
 {
         int ret = -EIO;
+        void __user *datap = (void __user *) data;
 
         switch (request) {
         case PTRACE_GETFPXREGS: /* Get the child FPU state. */
-                ret = get_fpregs((struct user_i387_struct __user *) data,
-                                 child);
+                ret = get_fpregs(datap, child);
                 break;
         case PTRACE_SETFPXREGS: /* Set the child FPU state. */
-                ret = set_fpregs((struct user_i387_struct __user *) data,
-                                 child);
+                ret = set_fpregs(datap, child);
                 break;
         }