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/kernel/alternative.c | |
| 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/kernel/alternative.c')
| -rw-r--r-- | arch/x86/kernel/alternative.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index 23fb4d51a5da..175cde66a1ae 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -714,7 +714,7 @@ asm ( " .type int3_magic, @function\n" "int3_magic:\n" " movl $1, (%" _ASM_ARG1 ")\n" -" ret\n" + ASM_RET " .size int3_magic, .-int3_magic\n" " .popsection\n" ); |