2 files changed, 15 insertions, 12 deletions

diff --git a/arch/sh/kernel/ptrace_32.c b/arch/sh/kernel/ptrace_32.c
index 2cd42b58cb20..34bf03745e86 100644
--- a/arch/sh/kernel/ptrace_32.c
+++ b/arch/sh/kernel/ptrace_32.c
@@ -365,7 +365,8 @@ const struct user_regset_view *task_user_regset_view(struct task_struct *task)
         return &user_sh_native_view;
 }
 
-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)
 {
         struct user * dummy = NULL;
         unsigned long __user *datap = (unsigned long __user *)data;
@@ -383,17 +384,17 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
 
                 if (addr < sizeof(struct pt_regs))
                         tmp = get_stack_long(child, addr);
-                else if (addr >= (long) &dummy->fpu &&
-                         addr < (long) &dummy->u_fpvalid) {
+                else if (addr >= (unsigned long) &dummy->fpu &&
+                         addr < (unsigned long) &dummy->u_fpvalid) {
                         if (!tsk_used_math(child)) {
-                                if (addr == (long)&dummy->fpu.fpscr)
+                                if (addr == (unsigned long)&dummy->fpu.fpscr)
                                         tmp = FPSCR_INIT;
                                 else
                                         tmp = 0;
                         } else
-                                tmp = ((long *)child->thread.xstate)
+                                tmp = ((unsigned long *)child->thread.xstate)
                                         [(addr - (long)&dummy->fpu) >> 2];
-                } else if (addr == (long) &dummy->u_fpvalid)
+                } else if (addr == (unsigned long) &dummy->u_fpvalid)
                         tmp = !!tsk_used_math(child);
                 else if (addr == PT_TEXT_ADDR)
                         tmp = child->mm->start_code;
@@ -417,13 +418,13 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
 
                 if (addr < sizeof(struct pt_regs))
                         ret = put_stack_long(child, addr, data);
-                else if (addr >= (long) &dummy->fpu &&
-                         addr < (long) &dummy->u_fpvalid) {
+                else if (addr >= (unsigned long) &dummy->fpu &&
+                         addr < (unsigned long) &dummy->u_fpvalid) {
                         set_stopped_child_used_math(child);
-                        ((long *)child->thread.xstate)
+                        ((unsigned long *)child->thread.xstate)
                                 [(addr - (long)&dummy->fpu) >> 2] = data;
                         ret = 0;
-                } else if (addr == (long) &dummy->u_fpvalid) {
+                } else if (addr == (unsigned long) &dummy->u_fpvalid) {
                         conditional_stopped_child_used_math(data, child);
                         ret = 0;
                 }
diff --git a/arch/sh/kernel/ptrace_64.c b/arch/sh/kernel/ptrace_64.c
index e0fb065914aa..4840716c196a 100644
--- a/arch/sh/kernel/ptrace_64.c
+++ b/arch/sh/kernel/ptrace_64.c
@@ -383,7 +383,8 @@ const struct user_regset_view *task_user_regset_view(struct task_struct *task)
         return &user_sh64_native_view;
 }
 
-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;
 
@@ -471,7 +472,8 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
         return ret;
 }
 
-asmlinkage int sh64_ptrace(long request, long pid, long addr, long data)
+asmlinkage int sh64_ptrace(long request, long pid,
+                           unsigned long addr, unsigned long data)
 {
 #define WPC_DBRMODE 0x0d104008
         static unsigned long first_call;