Skip to content

Commit

Permalink
x86/asm/entry/64: Remove pointless jump to irq_return
Browse files Browse the repository at this point in the history
INTERRUPT_RETURN turns into a jmp instruction.  There's no need
for extra indirection.

Signed-off-by: Andy Lutomirski <luto@kernel.org>
Cc: <linux-kernel@vger.kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/2f2318653dbad284a59311f13f08cea71298fd7c.1433449436.git.luto@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
  • Loading branch information
Andy Lutomirski authored and Ingo Molnar committed Jun 5, 2015
1 parent cf991de commit 5ca6f70
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions arch/x86/entry/entry_64.S
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 5ca6f70

Please sign in to comment.