Skip to content

Commit

Permalink
x86/asm/entry/64: Get rid of int_ret_from_sys_call_fixup
Browse files Browse the repository at this point in the history
With the FIXUP_TOP_OF_STACK macro removed, this intermediate jump
is unnecessary.

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Acked-by: Borislav Petkov <bp@suse.de>
Acked-by: Andy 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: Ingo Molnar <mingo@kernel.org>
  • Loading branch information
Denys Vlasenko authored and Ingo Molnar committed Mar 24, 2015
1 parent a71ffdd commit 65c2377
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions arch/x86/kernel/entry_64.S
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down

0 comments on commit 65c2377

Please sign in to comment.