summaryrefslogtreecommitdiffstats
path: root/arch/v850/kernel/ptrace.c
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2005-10-31 11:06:46 +0100
committerAnton Altaparmakov <aia21@cantab.net>2005-10-31 11:06:46 +0100
commit1f04c0a24b2f3cfe89c802a24396263623e3512d (patch)
treed7e2216b6e65b833c0c2b79b478d13ce17dbf296 /arch/v850/kernel/ptrace.c
parentMerge branch 'master' of /usr/src/ntfs-2.6/ (diff)
parentpowerpc: import a fix from arch/ppc/mm/pgtable.c (diff)
downloadlinux-1f04c0a24b2f3cfe89c802a24396263623e3512d.tar.xz
linux-1f04c0a24b2f3cfe89c802a24396263623e3512d.zip
Merge branch 'master' of /usr/src/ntfs-2.6/
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;