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

Conflicts:
	litmus/sched_cedf.c

1 files changed, 6 insertions, 5 deletions

diff --git a/arch/m32r/kernel/ptrace.c b/arch/m32r/kernel/ptrace.c
index 0021ade4cba8..20743754f2b2 100644
--- a/arch/m32r/kernel/ptrace.c
+++ b/arch/m32r/kernel/ptrace.c
@@ -622,9 +622,11 @@ void ptrace_disable(struct task_struct *child)
 }
 
 long
-arch_ptrace(struct task_struct *child, long request, long addr, long data)
+arch_ptrace(struct task_struct *child, long request,
+            unsigned long addr, unsigned long data)
 {
         int ret;
+        unsigned long __user *datap = (unsigned long __user *) data;
 
         switch (request) {
         /*
@@ -639,8 +641,7 @@ arch_ptrace(struct task_struct *child, long request, long addr, long data)
          * read the word at location addr in the USER area.
          */
         case PTRACE_PEEKUSR:
-                ret = ptrace_read_user(child, addr,
-                                       (unsigned long __user *)data);
+                ret = ptrace_read_user(child, addr, datap);
                 break;
 
         /*
@@ -661,11 +662,11 @@ arch_ptrace(struct task_struct *child, long request, long addr, long data)
                 break;
 
         case PTRACE_GETREGS:
-                ret = ptrace_getregs(child, (void __user *)data);
+                ret = ptrace_getregs(child, datap);
                 break;
 
         case PTRACE_SETREGS:
-                ret = ptrace_setregs(child, (void __user *)data);
+                ret = ptrace_setregs(child, datap);
                 break;
 
         default: