diff options
| author | Andi Kleen <ak@suse.de> | 2006-05-30 22:48:03 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-30 20:31:06 -0700 |
| commit | 822ff019f72ae01baef1893e86735f1a5e36be7d (patch) | |
| tree | 55c5215329b85c1b682bb1845361055500219945 /arch/x86_64/kernel/entry.S | |
| parent | 7ca97c6131dac9f06b1856a95a2ec89d43844286 (diff) | |
| download | op-kernel-dev-822ff019f72ae01baef1893e86735f1a5e36be7d.zip op-kernel-dev-822ff019f72ae01baef1893e86735f1a5e36be7d.tar.gz | |
[PATCH] x86_64: Don't do syscall exit tracing twice
int_ret_from_syscall already does syscall exit tracing, so
no need to do it again in the caller.
This caused problems for UML and some other special programs doing
syscall interception.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/x86_64/kernel/entry.S')
| -rw-r--r-- | arch/x86_64/kernel/entry.S | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S index c946e4f..586b34c 100644 --- a/arch/x86_64/kernel/entry.S +++ b/arch/x86_64/kernel/entry.S @@ -281,12 +281,7 @@ tracesys: ja 1f movq %r10,%rcx /* fixup for C */ call *sys_call_table(,%rax,8) - movq %rax,RAX-ARGOFFSET(%rsp) -1: SAVE_REST - movq %rsp,%rdi - call syscall_trace_leave - RESTORE_TOP_OF_STACK %rbx - RESTORE_REST +1: movq %rax,RAX-ARGOFFSET(%rsp) /* Use IRET because user could have changed frame */ jmp int_ret_from_sys_call CFI_ENDPROC |
