diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2021-12-04 16:43:40 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-05-15 21:18:49 +0300 |
| commit | 14b476e07fab62d47d872bc99843a0d707f7cc94 (patch) | |
| tree | 89a956f69da569ab192cd70e542ad268b9cd4143 /arch/x86/entry/thunk_32.S | |
| parent | 89837223d00d52d2d1e641c626acda11d9ef1a6c (diff) | |
| download | linux-14b476e07fab62d47d872bc99843a0d707f7cc94.tar.xz | |
x86: Prepare asm files for straight-line-speculation
[ Upstream commit f94909ceb1ed4bfdb2ada72f93236305e6d6951f ]
Replace all ret/retq instructions with RET in preparation of making
RET a macro. Since AS is case insensitive it's a big no-op without
RET defined.
find arch/x86/ -name \*.S | while read file
do
sed -i 's/\<ret[q]*\>/RET/' $file
done
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lore.kernel.org/r/20211204134907.905503893@infradead.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/entry/thunk_32.S')
| -rw-r--r-- | arch/x86/entry/thunk_32.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/entry/thunk_32.S b/arch/x86/entry/thunk_32.S index f1f96d4d8cd6..7591bab060f7 100644 --- a/arch/x86/entry/thunk_32.S +++ b/arch/x86/entry/thunk_32.S @@ -24,7 +24,7 @@ SYM_CODE_START_NOALIGN(\name) popl %edx popl %ecx popl %eax - ret + RET _ASM_NOKPROBE(\name) SYM_CODE_END(\name) .endm |