Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / arch / sh / kernel / ptrace.c

diff --git a/arch/sh/kernel/ptrace.c b/arch/sh/kernel/ptrace.c
index b28919b65682ab475d6463c20763084de8946da3..1fbe5a428e31fe54c017a58bff0d5b82efaea24e 100644 (file)
--- a/arch/sh/kernel/ptrace.c
+++ b/arch/sh/kernel/ptrace.c
@@ -80,7 +80,7 @@ void ptrace_disable(struct task_struct *child)
        /* nothing to do.. */
 }
 
-asmlinkage int sys_ptrace(long request, long pid, long addr, long data)
+asmlinkage long sys_ptrace(long request, long pid, long addr, long data)
 {
        struct task_struct *child;
        struct user * dummy = NULL;