powerpc: apply recent changes to merged code

Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-10-31 13:57:01 +11:00
parent 23fd07750a
commit 734d652480
6 changed files with 6 additions and 12 deletions
--- 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;