aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh64/kernel/ptrace.c
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2005-10-31 10:06:46 +0000
committerAnton Altaparmakov <aia21@cantab.net>2005-10-31 10:06:46 +0000
commit1f04c0a24b2f3cfe89c802a24396263623e3512d (patch)
treed7e2216b6e65b833c0c2b79b478d13ce17dbf296 /arch/sh64/kernel/ptrace.c
parent07b188ab773e183871e57b33ae37bf635c9f12ba (diff)
parente2f2e58e7968f8446b1078a20a18bf8ea12b4fbc (diff)
downloadkernel_samsung_smdk4412-1f04c0a24b2f3cfe89c802a24396263623e3512d.zip
kernel_samsung_smdk4412-1f04c0a24b2f3cfe89c802a24396263623e3512d.tar.gz
kernel_samsung_smdk4412-1f04c0a24b2f3cfe89c802a24396263623e3512d.tar.bz2
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'arch/sh64/kernel/ptrace.c')
-rw-r--r--arch/sh64/kernel/ptrace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh64/kernel/ptrace.c b/arch/sh64/kernel/ptrace.c
index fd20009..71f2eec 100644
--- a/arch/sh64/kernel/ptrace.c
+++ b/arch/sh64/kernel/ptrace.c
@@ -121,7 +121,7 @@ put_fpu_long(struct task_struct *task, unsigned long addr, unsigned long data)
return 0;
}
-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;
extern void poke_real_address_q(unsigned long long addr, unsigned long long data);