diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2022-03-08 18:30:21 +0300 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2022-03-15 12:32:34 +0300 |
| commit | 6cf3e4c0d29102c74aca1ce0c1710be9d02e440e (patch) | |
| tree | 34f0351c5717e0a5de77ba1b3dccf55dac2ce9a7 | |
| parent | ba27d1a80871eb8dbeddf34ec7d396c149cbb8d7 (diff) | |
| download | linux-6cf3e4c0d29102c74aca1ce0c1710be9d02e440e.tar.xz | |
x86/entry: Cleanup PARAVIRT
Since commit 5c8f6a2e316e ("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: Andrew Cooper <Andrew.Cooper3@citrix.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Josh Poimboeuf <jpoimboe@redhat.com>
Link: https://lore.kernel.org/r/20220308154317.756014488@infradead.org
| -rw-r--r-- | arch/x86/entry/entry_64.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index 466df3e50276..22e4e9aafc34 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -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) |