From 944eb2800edf64298b8ed7e24ee16da2fd61bb55 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Sun, 30 Oct 2005 15:02:21 -0800 Subject: [PATCH] --- yaml --- r: 11830 b: refs/heads/master c: 7024a9b884ed7657fb873e655cd124d85ae792a4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/parisc/kernel/ptrace.c | 2 +- trunk/include/asm-parisc/unistd.h | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6b4c02908fa6..c7a45335b8f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4eb9af2a8a431a832830f986fead7332dab27229 +refs/heads/master: 7024a9b884ed7657fb873e655cd124d85ae792a4 diff --git a/trunk/arch/parisc/kernel/ptrace.c b/trunk/arch/parisc/kernel/ptrace.c index f3428e5e86fb..18130c3748f3 100644 --- a/trunk/arch/parisc/kernel/ptrace.c +++ b/trunk/arch/parisc/kernel/ptrace.c @@ -78,7 +78,7 @@ void ptrace_disable(struct task_struct *child) pa_psw(child)->l = 0; } -long sys_ptrace(long request, pid_t pid, long addr, long data) +long sys_ptrace(long request, long pid, long addr, long data) { struct task_struct *child; long ret; diff --git a/trunk/include/asm-parisc/unistd.h b/trunk/include/asm-parisc/unistd.h index e7a620c5c5e6..80b7b98c70a1 100644 --- a/trunk/include/asm-parisc/unistd.h +++ b/trunk/include/asm-parisc/unistd.h @@ -1011,7 +1011,6 @@ int sys_clone(unsigned long clone_flags, unsigned long usp, struct pt_regs *regs); int sys_vfork(struct pt_regs *regs); int sys_pipe(int *fildes); -long sys_ptrace(long request, pid_t pid, long addr, long data); struct sigaction; asmlinkage long sys_rt_sigaction(int sig, const struct sigaction __user *act,