diff options
author | David Woodhouse | 2006-05-06 20:59:18 +0200 |
---|---|---|
committer | David Woodhouse | 2006-05-06 20:59:18 +0200 |
commit | 5047f09b56d0bc3c21aec9cb16de60283da645c6 (patch) | |
tree | 09a07554b933c3bb912ce3bfc0ea7c7e1f16041c /arch/mips/kernel/ptrace.c | |
parent | Revert include/media changes: Mauro says those ioctls are only used in-kernel(!) (diff) | |
parent | [TCP]: Fix snd_cwnd adjustments in tcp_highspeed.c (diff) | |
download | kernel-qcow2-linux-5047f09b56d0bc3c21aec9cb16de60283da645c6.tar.gz kernel-qcow2-linux-5047f09b56d0bc3c21aec9cb16de60283da645c6.tar.xz kernel-qcow2-linux-5047f09b56d0bc3c21aec9cb16de60283da645c6.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'arch/mips/kernel/ptrace.c')
-rw-r--r-- | arch/mips/kernel/ptrace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c index f3106d0771b0..9b4733c12395 100644 --- a/arch/mips/kernel/ptrace.c +++ b/arch/mips/kernel/ptrace.c @@ -483,7 +483,7 @@ static inline int audit_arch(void) asmlinkage void do_syscall_trace(struct pt_regs *regs, int entryexit) { if (unlikely(current->audit_context) && entryexit) - audit_syscall_exit(current, AUDITSC_RESULT(regs->regs[2]), + audit_syscall_exit(AUDITSC_RESULT(regs->regs[2]), regs->regs[2]); if (!(current->ptrace & PT_PTRACED)) @@ -507,7 +507,7 @@ asmlinkage void do_syscall_trace(struct pt_regs *regs, int entryexit) } out: if (unlikely(current->audit_context) && !entryexit) - audit_syscall_entry(current, audit_arch(), regs->regs[2], + audit_syscall_entry(audit_arch(), regs->regs[2], regs->regs[4], regs->regs[5], regs->regs[6], regs->regs[7]); } |