From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932676AbbFGIb7 (ORCPT ); Sun, 7 Jun 2015 04:31:59 -0400 Received: from terminus.zytor.com ([198.137.202.10]:52980 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932463AbbFGIbx (ORCPT ); Sun, 7 Jun 2015 04:31:53 -0400 Date: Sun, 7 Jun 2015 01:30:38 -0700 From: tip-bot for Andy Lutomirski Message-ID: Cc: luto@amacapital.net, brgerst@gmail.com, bp@alien8.de, dvlasenk@redhat.com, peterz@infradead.org, torvalds@linux-foundation.org, luto@kernel.org, tglx@linutronix.de, akpm@linux-foundation.org, mingo@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com Reply-To: tglx@linutronix.de, luto@kernel.org, mingo@kernel.org, akpm@linux-foundation.org, linux-kernel@vger.kernel.org, hpa@zytor.com, luto@amacapital.net, brgerst@gmail.com, bp@alien8.de, dvlasenk@redhat.com, peterz@infradead.org, torvalds@linux-foundation.org In-Reply-To: <2f2318653dbad284a59311f13f08cea71298fd7c.1433449436.git.luto@kernel.org> References: <2f2318653dbad284a59311f13f08cea71298fd7c.1433449436.git.luto@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/asm/entry/64: Remove pointless jump to irq_return Git-Commit-ID: 5ca6f70f387b4f82903037cc3c5488e2c97dcdbc 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: 5ca6f70f387b4f82903037cc3c5488e2c97dcdbc Gitweb: http://git.kernel.org/tip/5ca6f70f387b4f82903037cc3c5488e2c97dcdbc Author: Andy Lutomirski AuthorDate: Thu, 4 Jun 2015 13:24:29 -0700 Committer: Ingo Molnar CommitDate: Fri, 5 Jun 2015 12:42:41 +0200 x86/asm/entry/64: Remove pointless jump to irq_return INTERRUPT_RETURN turns into a jmp instruction. There's no need for extra indirection. Signed-off-by: Andy Lutomirski Cc: Cc: Andrew Morton Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/2f2318653dbad284a59311f13f08cea71298fd7c.1433449436.git.luto@kernel.org Signed-off-by: Ingo Molnar --- arch/x86/entry/entry_64.S | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index f7380ea..3177066 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -663,8 +663,6 @@ retint_kernel: restore_c_regs_and_iret: RESTORE_C_REGS REMOVE_PT_GPREGS_FROM_STACK 8 - -irq_return: INTERRUPT_RETURN ENTRY(native_iret) @@ -1432,7 +1430,7 @@ nmi_restore: /* Clear the NMI executing stack variable */ movq $0, 5*8(%rsp) - jmp irq_return + INTERRUPT_RETURN END(nmi) ENTRY(ignore_sysret)