Messages in this thread Patch in this message | | | Date | Wed, 25 Mar 2015 02:11:35 -0700 | From | tip-bot for Denys Vlasenko <> | Subject | [tip:x86/asm] x86/asm/entry/64: Get rid of int_ret_from_sys_call_fixup |
| |
Commit-ID: 65c2377486c0b68f149f7d8770499a86b15786b6 Gitweb: http://git.kernel.org/tip/65c2377486c0b68f149f7d8770499a86b15786b6 Author: Denys Vlasenko <dvlasenk@redhat.com> AuthorDate: Thu, 19 Mar 2015 18:17:49 +0100 Committer: Ingo Molnar <mingo@kernel.org> CommitDate: Tue, 24 Mar 2015 19:42:38 +0100
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: 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> --- arch/x86/kernel/entry_64.S | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 3f8daba..df04ee06 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -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
| |