diff options
| author |   Peter Zijlstra <peterz@infradead.org> | 2021-12-04 14:43:40 +0100 |
|---|---|---|
| committer |   Borislav Petkov <bp@suse.de> | 2021-12-08 12:25:37 +0100 |
| commit | f94909ceb1ed4bfdb2ada72f93236305e6d6951f (patch) | |
| tree | e7368c974b829530e82f34111f1f5ab183504921 /arch/x86/crypto/chacha-ssse3-x86_64.S | |
| parent | x86/lib/atomic64_386_32: Rename things (diff) | |
| download | linux-dev-f94909ceb1ed4bfdb2ada72f93236305e6d6951f.tar.xz linux-dev-f94909ceb1ed4bfdb2ada72f93236305e6d6951f.zip | |
x86: Prepare asm files for straight-line-speculation
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
Diffstat (limited to 'arch/x86/crypto/chacha-ssse3-x86_64.S')
| -rw-r--r-- | arch/x86/crypto/chacha-ssse3-x86_64.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/crypto/chacha-ssse3-x86_64.S b/arch/x86/crypto/chacha-ssse3-x86_64.S index ca1788bfee16..7111949cd5b9 100644 --- a/arch/x86/crypto/chacha-ssse3-x86_64.S +++ b/arch/x86/crypto/chacha-ssse3-x86_64.S @@ -108,7 +108,7 @@ SYM_FUNC_START_LOCAL(chacha_permute) sub $2,%r8d jnz .Ldoubleround - ret + RET SYM_FUNC_END(chacha_permute) SYM_FUNC_START(chacha_block_xor_ssse3) @@ -166,7 +166,7 @@ SYM_FUNC_START(chacha_block_xor_ssse3) .Ldone: FRAME_END - ret + RET .Lxorpart: # xor remaining bytes from partial register into output @@ -217,7 +217,7 @@ SYM_FUNC_START(hchacha_block_ssse3) movdqu %xmm3,0x10(%rsi) FRAME_END - ret + RET SYM_FUNC_END(hchacha_block_ssse3) SYM_FUNC_START(chacha_4block_xor_ssse3) @@ -762,7 +762,7 @@ SYM_FUNC_START(chacha_4block_xor_ssse3) .Ldone4: lea -8(%r10),%rsp - ret + RET .Lxorpart4: # xor remaining bytes from partial register into output |