diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-05-05 14:43:19 -0500 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-05-05 14:43:19 -0500 |
| commit | 6f817abc643ec84cf07c99f964d04976212e1fd3 (patch) | |
| tree | 982d6e35796cf0c3c01899db1a8dc062d95c92c2 /arch/ia64 | |
| parent | f77165df5ba75461b491a9f20f778307f1b4a0ac (diff) | |
| parent | bfd4bda097f8758d28e632ff2035e25577f6b060 (diff) | |
| download | kernel-crypto-6f817abc643ec84cf07c99f964d04976212e1fd3.tar.gz kernel-crypto-6f817abc643ec84cf07c99f964d04976212e1fd3.tar.xz kernel-crypto-6f817abc643ec84cf07c99f964d04976212e1fd3.zip | |
Merge with /home/shaggy/git/linus-clean/
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/kernel/ptrace.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c index c253fd5914f..907464ee727 100644 --- a/arch/ia64/kernel/ptrace.c +++ b/arch/ia64/kernel/ptrace.c @@ -1596,20 +1596,25 @@ syscall_trace_enter (long arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6, long arg7, struct pt_regs regs) { - long syscall; + if (test_thread_flag(TIF_SYSCALL_TRACE) + && (current->ptrace & PT_PTRACED)) + syscall_trace(); if (unlikely(current->audit_context)) { - if (IS_IA32_PROCESS(®s)) + long syscall; + int arch; + + if (IS_IA32_PROCESS(®s)) { syscall = regs.r1; - else + arch = AUDIT_ARCH_I386; + } else { syscall = regs.r15; + arch = AUDIT_ARCH_IA64; + } - audit_syscall_entry(current, syscall, arg0, arg1, arg2, arg3); + audit_syscall_entry(current, arch, syscall, arg0, arg1, arg2, arg3); } - if (test_thread_flag(TIF_SYSCALL_TRACE) - && (current->ptrace & PT_PTRACED)) - syscall_trace(); } /* "asmlinkage" so the input arguments are preserved... */ @@ -1620,7 +1625,7 @@ syscall_trace_leave (long arg0, long arg1, long arg2, long arg3, struct pt_regs regs) { if (unlikely(current->audit_context)) - audit_syscall_exit(current, regs.r8); + audit_syscall_exit(current, AUDITSC_RESULT(regs.r10), regs.r8); if (test_thread_flag(TIF_SYSCALL_TRACE) && (current->ptrace & PT_PTRACED)) |