From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753058AbbCYJOs (ORCPT ); Wed, 25 Mar 2015 05:14:48 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37351 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752225AbbCYJMG (ORCPT ); Wed, 25 Mar 2015 05:12:06 -0400 Date: Wed, 25 Mar 2015 02:11:35 -0700 From: tip-bot for Denys Vlasenko Message-ID: Cc: mingo@kernel.org, dvlasenk@redhat.com, linux-kernel@vger.kernel.org, keescook@chromium.org, ast@plumgrid.com, tglx@linutronix.de, hpa@zytor.com, luto@kernel.org, wad@chromium.org, bp@suse.de, oleg@redhat.com, fweisbec@gmail.com, luto@amacapital.net, bp@alien8.de, rostedt@goodmis.org, torvalds@linux-foundation.org Reply-To: luto@kernel.org, hpa@zytor.com, wad@chromium.org, linux-kernel@vger.kernel.org, keescook@chromium.org, dvlasenk@redhat.com, mingo@kernel.org, tglx@linutronix.de, ast@plumgrid.com, bp@alien8.de, rostedt@goodmis.org, torvalds@linux-foundation.org, luto@amacapital.net, bp@suse.de, fweisbec@gmail.com, oleg@redhat.com In-Reply-To: <1426785469-15125-5-git-send-email-dvlasenk@redhat.com> References: <1426785469-15125-5-git-send-email-dvlasenk@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/asm/entry/64: Get rid of int_ret_from_sys_call_fixup Git-Commit-ID: 65c2377486c0b68f149f7d8770499a86b15786b6 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 65c2377486c0b68f149f7d8770499a86b15786b6 Gitweb: http://git.kernel.org/tip/65c2377486c0b68f149f7d8770499a86b15786b6 Author: Denys Vlasenko AuthorDate: Thu, 19 Mar 2015 18:17:49 +0100 Committer: Ingo Molnar 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 Acked-by: Borislav Petkov Acked-by: Andy Lutomirski Cc: Alexei Starovoitov Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Frederic Weisbecker Cc: H. Peter Anvin Cc: Kees Cook Cc: Linus Torvalds Cc: Oleg Nesterov Cc: Steven Rostedt Cc: Will Drewry Link: http://lkml.kernel.org/r/1426785469-15125-5-git-send-email-dvlasenk@redhat.com Signed-off-by: Ingo Molnar --- 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