1 files changed, 8 insertions, 7 deletions

diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
index aa90da08bf61..9ccc812bc09e 100644
--- a/arch/sparc/kernel/ptrace_64.c
+++ b/arch/sparc/kernel/ptrace_64.c
@@ -969,16 +969,19 @@ struct fps {
         unsigned long fsr;
 };
 
-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)
 {
         const struct user_regset_view *view = task_user_regset_view(current);
         unsigned long addr2 = task_pt_regs(current)->u_regs[UREG_I4];
         struct pt_regs __user *pregs;
         struct fps __user *fps;
+        void __user *addr2p;
         int ret;
 
-        pregs = (struct pt_regs __user *) (unsigned long) addr;
-        fps = (struct fps __user *) (unsigned long) addr;
+        pregs = (struct pt_regs __user *) addr;
+        fps = (struct fps __user *) addr;
+        addr2p = (void __user *) addr2;
 
         switch (request) {
         case PTRACE_PEEKUSR:
@@ -1029,8 +1032,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
 
         case PTRACE_READTEXT:
         case PTRACE_READDATA:
-                ret = ptrace_readdata(child, addr,
-                                      (char __user *)addr2, data);
+                ret = ptrace_readdata(child, addr, addr2p, data);
                 if (ret == data)
                         ret = 0;
                 else if (ret >= 0)
@@ -1039,8 +1041,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
 
         case PTRACE_WRITETEXT:
         case PTRACE_WRITEDATA:
-                ret = ptrace_writedata(child, (char __user *) addr2,
-                                       addr, data);
+                ret = ptrace_writedata(child, addr2p, addr, data);
                 if (ret == data)
                         ret = 0;
                 else if (ret >= 0)