Skip to content

Commit 5ca6f70

Browse files
amlutoIngo Molnar
authored andcommitted
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 <[email protected]> Cc: <[email protected]> Cc: Andrew Morton <[email protected]> Cc: Andy Lutomirski <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Brian Gerst <[email protected]> Cc: Denys Vlasenko <[email protected]> Cc: H. Peter Anvin <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Thomas Gleixner <[email protected]> Link: http://lkml.kernel.org/r/2f2318653dbad284a59311f13f08cea71298fd7c.1433449436.git.luto@kernel.org Signed-off-by: Ingo Molnar <[email protected]>
1 parent cf991de commit 5ca6f70

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

arch/x86/entry/entry_64.S

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -663,8 +663,6 @@ retint_kernel:
663663
restore_c_regs_and_iret:
664664
RESTORE_C_REGS
665665
REMOVE_PT_GPREGS_FROM_STACK 8
666-
667-
irq_return:
668666
INTERRUPT_RETURN
669667

670668
ENTRY(native_iret)
@@ -1432,7 +1430,7 @@ nmi_restore:
14321430

14331431
/* Clear the NMI executing stack variable */
14341432
movq $0, 5*8(%rsp)
1435-
jmp irq_return
1433+
INTERRUPT_RETURN
14361434
END(nmi)
14371435

14381436
ENTRY(ignore_sysret)

0 commit comments

Comments
 (0)