diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-31 03:57:01 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-31 03:57:01 +0100 |
| commit | 734d6524800b6a8362666e893a5f3f29b9ef0be9 (patch) | |
| tree | 507fe9acc6fccce31369842d89d86d8dd432dc37 /arch/powerpc/kernel/ptrace.c | |
| parent | Merge ../linux-2.6 by hand (diff) | |
| download | linux-734d6524800b6a8362666e893a5f3f29b9ef0be9.tar.xz linux-734d6524800b6a8362666e893a5f3f29b9ef0be9.zip | |
powerpc: apply recent changes to merged code
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/ptrace.c')
| -rw-r--r-- | arch/powerpc/kernel/ptrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c index 943425a93354..568ea335d616 100644 --- a/arch/powerpc/kernel/ptrace.c +++ b/arch/powerpc/kernel/ptrace.c @@ -248,7 +248,7 @@ void ptrace_disable(struct task_struct *child) clear_single_step(child); } -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 ret = -EPERM; |