diff options
author | Peter Zijlstra <peterz@infradead.org> | 2021-12-04 16:43:41 +0300 |
---|---|---|
committer | Borislav Petkov <bp@suse.de> | 2021-12-08 21:23:12 +0300 |
commit | b17c2baa305cccbd16bafa289fd743cc2db77966 (patch) | |
tree | dd6c3b4e52c2f9bb1040c6f84f59244ea7ece435 /arch/x86/include/asm/paravirt.h | |
parent | f94909ceb1ed4bfdb2ada72f93236305e6d6951f (diff) | |
download | linux-b17c2baa305cccbd16bafa289fd743cc2db77966.tar.xz |
x86: Prepare inline-asm for straight-line-speculation
Replace all ret/retq instructions with ASM_RET in preparation of
making it more than a single instruction.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lore.kernel.org/r/20211204134907.964635458@infradead.org
Diffstat (limited to 'arch/x86/include/asm/paravirt.h')
-rw-r--r-- | arch/x86/include/asm/paravirt.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h index 21c4a694ca11..ce1148c5620b 100644 --- a/arch/x86/include/asm/paravirt.h +++ b/arch/x86/include/asm/paravirt.h @@ -671,7 +671,7 @@ bool __raw_callee_save___native_vcpu_is_preempted(long cpu); "call " #func ";" \ PV_RESTORE_ALL_CALLER_REGS \ FRAME_END \ - "ret;" \ + ASM_RET \ ".size " PV_THUNK_NAME(func) ", .-" PV_THUNK_NAME(func) ";" \ ".popsection") |