From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932125AbbFDUYg (ORCPT ); Thu, 4 Jun 2015 16:24:36 -0400 Received: from mail.kernel.org ([198.145.29.136]:50548 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752184AbbFDUYd (ORCPT ); Thu, 4 Jun 2015 16:24:33 -0400 From: Andy Lutomirski To: Ingo Molnar Cc: x86@kernel.org, "linux-kernel@vger.kernel.org" , Andy Lutomirski Subject: [PATCH] x86/asm/entry/64: Remove pointless jump to irq_return Date: Thu, 4 Jun 2015 13:24:29 -0700 Message-Id: <2f2318653dbad284a59311f13f08cea71298fd7c.1433449436.git.luto@kernel.org> X-Mailer: git-send-email 2.4.2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org INTERRUPT_RETURN turns into a jmp instruction. There's no need for extra indirection. Signed-off-by: Andy Lutomirski --- 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 f7380ea75777..31770662b940 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) -- 2.4.2