Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 822ff019 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[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: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7ca97c61

arch/x86_64/kernel/entry.S

+1 −6
Original line number Original line Diff line number Diff line
@@ -281,12 +281,7 @@ tracesys: 
	ja  1f

	ja  1f

	movq %r10,%rcx	/* fixup for C */

	movq %r10,%rcx	/* fixup for C */

	call *sys_call_table(,%rax,8)

	call *sys_call_table(,%rax,8)

	movq %rax,RAX-ARGOFFSET(%rsp)

1:	movq %rax,RAX-ARGOFFSET(%rsp)

1:	SAVE_REST

	movq %rsp,%rdi

	call syscall_trace_leave

	RESTORE_TOP_OF_STACK %rbx

	RESTORE_REST

	/* Use IRET because user could have changed frame */

	/* Use IRET because user could have changed frame */

	jmp int_ret_from_sys_call

	jmp int_ret_from_sys_call

	CFI_ENDPROC

	CFI_ENDPROC