diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-05-05 01:45:48 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-05-05 01:45:48 -0400 |
| commit | f18fc729cd2d67b76e24206ee3567c1f6983c358 (patch) | |
| tree | 9dbf177222d94213d9dd82d67de6d905e1a2b278 /arch/ia64 | |
| parent | 5a43ee65620d628ba04deecf241b63b2410b97f2 (diff) | |
| parent | d98550e334715b2d9e45f8f0f4e1608720108640 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/kernel/ptrace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c index 9887c8787e7a..e61e15e28d8b 100644 --- a/arch/ia64/kernel/ptrace.c +++ b/arch/ia64/kernel/ptrace.c | |||
| @@ -1644,7 +1644,7 @@ syscall_trace_enter (long arg0, long arg1, long arg2, long arg3, | |||
| 1644 | arch = AUDIT_ARCH_IA64; | 1644 | arch = AUDIT_ARCH_IA64; |
| 1645 | } | 1645 | } |
| 1646 | 1646 | ||
| 1647 | audit_syscall_entry(current, arch, syscall, arg0, arg1, arg2, arg3); | 1647 | audit_syscall_entry(arch, syscall, arg0, arg1, arg2, arg3); |
| 1648 | } | 1648 | } |
| 1649 | 1649 | ||
| 1650 | } | 1650 | } |
| @@ -1662,7 +1662,7 @@ syscall_trace_leave (long arg0, long arg1, long arg2, long arg3, | |||
| 1662 | 1662 | ||
| 1663 | if (success != AUDITSC_SUCCESS) | 1663 | if (success != AUDITSC_SUCCESS) |
| 1664 | result = -result; | 1664 | result = -result; |
| 1665 | audit_syscall_exit(current, success, result); | 1665 | audit_syscall_exit(success, result); |
| 1666 | } | 1666 | } |
| 1667 | 1667 | ||
| 1668 | if (test_thread_flag(TIF_SYSCALL_TRACE) | 1668 | if (test_thread_flag(TIF_SYSCALL_TRACE) |