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

Commit 65c23774 authored by Denys Vlasenko's avatar Denys Vlasenko Committed by Ingo Molnar
Browse files

x86/asm/entry/64: Get rid of int_ret_from_sys_call_fixup 



With the FIXUP_TOP_OF_STACK macro removed, this intermediate jump
is unnecessary.

Signed-off-by: default avatarDenys Vlasenko <dvlasenk@redhat.com>
Acked-by: default avatarBorislav Petkov <bp@suse.de>
Acked-by: default avatarAndy Lutomirski <luto@kernel.org>
Cc: Alexei Starovoitov <ast@plumgrid.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Will Drewry <wad@chromium.org>
Link: http://lkml.kernel.org/r/1426785469-15125-5-git-send-email-dvlasenk@redhat.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent a71ffdd7

arch/x86/kernel/entry_64.S

+1 −4
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ system_call_fastpath: 
 */

ret_from_sys_call:

	testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,SIZEOF_PTREGS)

	jnz int_ret_from_sys_call_fixup	/* Go the the slow path */

	jnz int_ret_from_sys_call	/* Go the slow path */



	LOCKDEP_SYS_EXIT

	DISABLE_INTERRUPTS(CLBR_NONE)
@@ -293,9 +293,6 @@ ret_from_sys_call: 


	CFI_RESTORE_STATE



int_ret_from_sys_call_fixup:

	jmp int_ret_from_sys_call



	/* Do syscall entry tracing */

tracesys:

	movq %rsp, %rdi