Commit 45c08383 authored Oct 23, 2019 by Thomas Gleixner

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 <tglx@linutronix.de>
Reviewed-by: Sean Christopherson <sean.j.christopherson@intel.com>
Reviewed-by: Alexandre Chartre <alexandre.chartre@oracle.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20191023123117.779277679@linutronix.de

parent df1a7524

arch/x86/entry/entry_64.S

+1 −2

Original line number	Diff line number	Diff line
		@@ -1273,12 +1273,11 @@ SYM_CODE_START_LOCAL(paranoid_exit)
		/* Always restore stashed CR3 value (see paranoid_entry) */
		RESTORE_CR3 scratch_reg=%rbx save_reg=%r14
		SWAPGS_UNSAFE_STACK
		jmp .Lparanoid_exit_restore
		jmp restore_regs_and_return_to_kernel
		.Lparanoid_exit_no_swapgs:
		TRACE_IRQS_IRETQ_DEBUG
		/* Always restore stashed CR3 value (see paranoid_entry) */
		RESTORE_CR3 scratch_reg=%rbx save_reg=%r14
		.Lparanoid_exit_restore:
		jmp restore_regs_and_return_to_kernel
		SYM_CODE_END(paranoid_exit)

Admin message