1 files changed, 13 insertions, 12 deletions

diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
index c8777333e198..d21c388c0116 100644
--- a/arch/mips/kernel/ptrace.c
+++ b/arch/mips/kernel/ptrace.c
@@ -255,9 +255,13 @@ int ptrace_set_watch_regs(struct task_struct *child,
         return 0;
 }
 
-long arch_ptrace(struct task_struct *child, long request, long addr, long data)
+long arch_ptrace(struct task_struct *child, long request,
+                 unsigned long addr, unsigned long data)
 {
         int ret;
+        void __user *addrp = (void __user *) addr;
+        void __user *datavp = (void __user *) data;
+        unsigned long __user *datalp = (void __user *) data;
 
         switch (request) {
         /* when I and D space are separate, these will need to be fixed. */
@@ -386,7 +390,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                         ret = -EIO;
                         goto out;
                 }
-                ret = put_user(tmp, (unsigned long __user *) data);
+                ret = put_user(tmp, datalp);
                 break;
         }
 
@@ -478,34 +482,31 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                 }
 
         case PTRACE_GETREGS:
-                ret = ptrace_getregs(child, (__s64 __user *) data);
+                ret = ptrace_getregs(child, datavp);
                 break;
 
         case PTRACE_SETREGS:
-                ret = ptrace_setregs(child, (__s64 __user *) data);
+                ret = ptrace_setregs(child, datavp);
                 break;
 
         case PTRACE_GETFPREGS:
-                ret = ptrace_getfpregs(child, (__u32 __user *) data);
+                ret = ptrace_getfpregs(child, datavp);
                 break;
 
         case PTRACE_SETFPREGS:
-                ret = ptrace_setfpregs(child, (__u32 __user *) data);
+                ret = ptrace_setfpregs(child, datavp);
                 break;
 
         case PTRACE_GET_THREAD_AREA:
-                ret = put_user(task_thread_info(child)->tp_value,
-                                (unsigned long __user *) data);
+                ret = put_user(task_thread_info(child)->tp_value, datalp);
                 break;
 
         case PTRACE_GET_WATCH_REGS:
-                ret = ptrace_get_watch_regs(child,
-                                        (struct pt_watch_regs __user *) addr);
+                ret = ptrace_get_watch_regs(child, addrp);
                 break;
 
         case PTRACE_SET_WATCH_REGS:
-                ret = ptrace_set_watch_regs(child,
-                                        (struct pt_watch_regs __user *) addr);
+                ret = ptrace_set_watch_regs(child, addrp);
                 break;
 
         default: