Commit 6cf3e4c0 authored by Peter Zijlstra's avatar Peter Zijlstra
Browse files

x86/entry: Cleanup PARAVIRT 



Since commit 5c8f6a2e ("x86/xen: Add
xenpv_restore_regs_and_return_to_usermode()") Xen will no longer reach
this code and we can do away with the paravirt
SWAPGS/INTERRUPT_RETURN.

Suggested-by: default avatarAndrew Cooper <Andrew.Cooper3@citrix.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Link: https://lore.kernel.org/r/20220308154317.756014488@infradead.org
parent ba27d1a8

arch/x86/entry/entry_64.S

+2 −2
Original line number Diff line number Diff line
@@ -608,8 +608,8 @@ SYM_INNER_LABEL(swapgs_restore_regs_and_return_to_usermode, SYM_L_GLOBAL) 


	/* Restore RDI. */

	popq	%rdi

	SWAPGS

	INTERRUPT_RETURN

	swapgs

	jmp	native_iret





SYM_INNER_LABEL(restore_regs_and_return_to_kernel, SYM_L_GLOBAL)