diff options
| author | Andi Kleen <ak@suse.de> | 2006-06-01 03:26:58 +0200 |
|---|---|---|
| committer | Chris Wright <chrisw@sous-sol.org> | 2006-06-05 10:18:14 -0700 |
| commit | d989306d6ac532795e225ad5303dfe4e4a81f51e (patch) | |
| tree | 27227618ea6ad70180dcc1f1d64f8e53e861c639 | |
| parent | d0252619737f158577225b3a596af573428c6da1 (diff) | |
| download | lwn-d989306d6ac532795e225ad5303dfe4e4a81f51e.tar.gz lwn-d989306d6ac532795e225ad5303dfe4e4a81f51e.zip | |
[PATCH] x86_64: Don't do syscall exit tracing twice
This fixes a regression from the earlier DOS fix for non canonical
IRET addresses. It broke UML.
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: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -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 ab6e44dcd1e9..97583bb9122d 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 |