Skip to content

Commit 45c0838

Browse files
committed
x86/entry/64: Remove pointless jump in paranoid_exit
Jump directly to restore_regs_and_return_to_kernel instead of making a pointless extra jump through .Lparanoid_exit_restore Signed-off-by: Thomas Gleixner <[email protected]> Reviewed-by: Sean Christopherson <[email protected]> Reviewed-by: Alexandre Chartre <[email protected]> Acked-by: Peter Zijlstra (Intel) <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent df1a752 commit 45c0838

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

arch/x86/entry/entry_64.S

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1273,12 +1273,11 @@ SYM_CODE_START_LOCAL(paranoid_exit)
12731273
/* Always restore stashed CR3 value (see paranoid_entry) */
12741274
RESTORE_CR3 scratch_reg=%rbx save_reg=%r14
12751275
SWAPGS_UNSAFE_STACK
1276-
jmp .Lparanoid_exit_restore
1276+
jmp restore_regs_and_return_to_kernel
12771277
.Lparanoid_exit_no_swapgs:
12781278
TRACE_IRQS_IRETQ_DEBUG
12791279
/* Always restore stashed CR3 value (see paranoid_entry) */
12801280
RESTORE_CR3 scratch_reg=%rbx save_reg=%r14
1281-
.Lparanoid_exit_restore:
12821281
jmp restore_regs_and_return_to_kernel
12831282
SYM_CODE_END(paranoid_exit)
12841283

0 commit comments

Comments
 (0)