| commit | 734d6524800b6a8362666e893a5f3f29b9ef0be9 | [log] [tgz] |
|---|---|---|
| author | Paul Mackerras <paulus@samba.org> | Mon Oct 31 13:57:01 2005 +1100 |
| committer | Paul Mackerras <paulus@samba.org> | Mon Oct 31 13:57:01 2005 +1100 |
| tree | 507fe9acc6fccce31369842d89d86d8dd432dc37 | |
| parent | 23fd07750a789a66fe88cf173d52a18f1a387da4 [diff] [blame] |
powerpc: apply recent changes to merged code Signed-off-by: Paul Mackerras <paulus@samba.org>
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c index 943425a..568ea33 100644 --- a/arch/powerpc/kernel/ptrace.c +++ b/arch/powerpc/kernel/ptrace.c
@@ -248,7 +248,7 @@ 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;