summaryrefslogtreecommitdiff
path: root/arch/v850/kernel/ptrace.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-05 23:44:02 +0300
committerJeff Garzik <jgarzik@pobox.com>2005-11-05 23:44:02 +0300
commit8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0 (patch)
tree41758e4da78f94a20813554ef9f5ed9b323a4f8c /arch/v850/kernel/ptrace.c
parentcd8200e6d4f9f05e6ea48f7c000be890337396ac (diff)
parent70d9d825e0a5a78ec1dacaaaf5c72ff5b0206fab (diff)
downloadlinux-8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0.tar.xz
Merge branch 'master'
Diffstat (limited to 'arch/v850/kernel/ptrace.c')
-rw-r--r--arch/v850/kernel/ptrace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/v850/kernel/ptrace.c b/arch/v850/kernel/ptrace.c
index 4726b87f5e5a..d6077ff47d22 100644
--- a/arch/v850/kernel/ptrace.c
+++ b/arch/v850/kernel/ptrace.c
@@ -113,7 +113,7 @@ static int set_single_step (struct task_struct *t, int val)
return 1;
}
-int sys_ptrace(long request, long pid, long addr, long data)
+long sys_ptrace(long request, long pid, long addr, long data)
{
struct task_struct *child;
int rval;