mirror of
https://github.com/torvalds/linux.git
synced 2024-11-14 08:02:07 +00:00
crypto: x86/poly1305 - Fixup SLS
Due to being a perl generated asm file, it got missed by the mass
convertion script.
arch/x86/crypto/poly1305-x86_64-cryptogams.o: warning: objtool: poly1305_init_x86_64()+0x3a: missing int3 after ret
arch/x86/crypto/poly1305-x86_64-cryptogams.o: warning: objtool: poly1305_blocks_x86_64()+0xf2: missing int3 after ret
arch/x86/crypto/poly1305-x86_64-cryptogams.o: warning: objtool: poly1305_emit_x86_64()+0x37: missing int3 after ret
arch/x86/crypto/poly1305-x86_64-cryptogams.o: warning: objtool: __poly1305_block()+0x6d: missing int3 after ret
arch/x86/crypto/poly1305-x86_64-cryptogams.o: warning: objtool: __poly1305_init_avx()+0x1e8: missing int3 after ret
arch/x86/crypto/poly1305-x86_64-cryptogams.o: warning: objtool: poly1305_blocks_avx()+0x18a: missing int3 after ret
arch/x86/crypto/poly1305-x86_64-cryptogams.o: warning: objtool: poly1305_blocks_avx()+0xaf8: missing int3 after ret
arch/x86/crypto/poly1305-x86_64-cryptogams.o: warning: objtool: poly1305_emit_avx()+0x99: missing int3 after ret
arch/x86/crypto/poly1305-x86_64-cryptogams.o: warning: objtool: poly1305_blocks_avx2()+0x18a: missing int3 after ret
arch/x86/crypto/poly1305-x86_64-cryptogams.o: warning: objtool: poly1305_blocks_avx2()+0x776: missing int3 after ret
arch/x86/crypto/poly1305-x86_64-cryptogams.o: warning: objtool: poly1305_blocks_avx512()+0x18a: missing int3 after ret
arch/x86/crypto/poly1305-x86_64-cryptogams.o: warning: objtool: poly1305_blocks_avx512()+0x796: missing int3 after ret
arch/x86/crypto/poly1305-x86_64-cryptogams.o: warning: objtool: poly1305_blocks_avx512()+0x10bd: missing int3 after ret
Fixes: f94909ceb1
("x86: Prepare asm files for straight-line-speculation")
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
parent
4327d16851
commit
7ed7aa4de9
@ -297,7 +297,7 @@ ___
|
||||
$code.=<<___;
|
||||
mov \$1,%eax
|
||||
.Lno_key:
|
||||
ret
|
||||
RET
|
||||
___
|
||||
&end_function("poly1305_init_x86_64");
|
||||
|
||||
@ -373,7 +373,7 @@ $code.=<<___;
|
||||
.cfi_adjust_cfa_offset -48
|
||||
.Lno_data:
|
||||
.Lblocks_epilogue:
|
||||
ret
|
||||
RET
|
||||
.cfi_endproc
|
||||
___
|
||||
&end_function("poly1305_blocks_x86_64");
|
||||
@ -399,7 +399,7 @@ $code.=<<___;
|
||||
mov %rax,0($mac) # write result
|
||||
mov %rcx,8($mac)
|
||||
|
||||
ret
|
||||
RET
|
||||
___
|
||||
&end_function("poly1305_emit_x86_64");
|
||||
if ($avx) {
|
||||
@ -429,7 +429,7 @@ ___
|
||||
&poly1305_iteration();
|
||||
$code.=<<___;
|
||||
pop $ctx
|
||||
ret
|
||||
RET
|
||||
.size __poly1305_block,.-__poly1305_block
|
||||
|
||||
.type __poly1305_init_avx,\@abi-omnipotent
|
||||
@ -594,7 +594,7 @@ __poly1305_init_avx:
|
||||
|
||||
lea -48-64($ctx),$ctx # size [de-]optimization
|
||||
pop %rbp
|
||||
ret
|
||||
RET
|
||||
.size __poly1305_init_avx,.-__poly1305_init_avx
|
||||
___
|
||||
|
||||
@ -747,7 +747,7 @@ $code.=<<___;
|
||||
.cfi_restore %rbp
|
||||
.Lno_data_avx:
|
||||
.Lblocks_avx_epilogue:
|
||||
ret
|
||||
RET
|
||||
.cfi_endproc
|
||||
|
||||
.align 32
|
||||
@ -1452,7 +1452,7 @@ $code.=<<___ if (!$win64);
|
||||
___
|
||||
$code.=<<___;
|
||||
vzeroupper
|
||||
ret
|
||||
RET
|
||||
.cfi_endproc
|
||||
___
|
||||
&end_function("poly1305_blocks_avx");
|
||||
@ -1508,7 +1508,7 @@ $code.=<<___;
|
||||
mov %rax,0($mac) # write result
|
||||
mov %rcx,8($mac)
|
||||
|
||||
ret
|
||||
RET
|
||||
___
|
||||
&end_function("poly1305_emit_avx");
|
||||
|
||||
@ -1675,7 +1675,7 @@ $code.=<<___;
|
||||
.cfi_restore %rbp
|
||||
.Lno_data_avx2$suffix:
|
||||
.Lblocks_avx2_epilogue$suffix:
|
||||
ret
|
||||
RET
|
||||
.cfi_endproc
|
||||
|
||||
.align 32
|
||||
@ -2201,7 +2201,7 @@ $code.=<<___ if (!$win64);
|
||||
___
|
||||
$code.=<<___;
|
||||
vzeroupper
|
||||
ret
|
||||
RET
|
||||
.cfi_endproc
|
||||
___
|
||||
if($avx > 2 && $avx512) {
|
||||
@ -2792,7 +2792,7 @@ $code.=<<___ if (!$win64);
|
||||
.cfi_def_cfa_register %rsp
|
||||
___
|
||||
$code.=<<___;
|
||||
ret
|
||||
RET
|
||||
.cfi_endproc
|
||||
___
|
||||
|
||||
@ -2893,7 +2893,7 @@ $code.=<<___ if ($flavour =~ /elf32/);
|
||||
___
|
||||
$code.=<<___;
|
||||
mov \$1,%eax
|
||||
ret
|
||||
RET
|
||||
.size poly1305_init_base2_44,.-poly1305_init_base2_44
|
||||
___
|
||||
{
|
||||
@ -3010,7 +3010,7 @@ poly1305_blocks_vpmadd52:
|
||||
jnz .Lblocks_vpmadd52_4x
|
||||
|
||||
.Lno_data_vpmadd52:
|
||||
ret
|
||||
RET
|
||||
.size poly1305_blocks_vpmadd52,.-poly1305_blocks_vpmadd52
|
||||
___
|
||||
}
|
||||
@ -3451,7 +3451,7 @@ poly1305_blocks_vpmadd52_4x:
|
||||
vzeroall
|
||||
|
||||
.Lno_data_vpmadd52_4x:
|
||||
ret
|
||||
RET
|
||||
.size poly1305_blocks_vpmadd52_4x,.-poly1305_blocks_vpmadd52_4x
|
||||
___
|
||||
}
|
||||
@ -3824,7 +3824,7 @@ $code.=<<___;
|
||||
vzeroall
|
||||
|
||||
.Lno_data_vpmadd52_8x:
|
||||
ret
|
||||
RET
|
||||
.size poly1305_blocks_vpmadd52_8x,.-poly1305_blocks_vpmadd52_8x
|
||||
___
|
||||
}
|
||||
@ -3861,7 +3861,7 @@ poly1305_emit_base2_44:
|
||||
mov %rax,0($mac) # write result
|
||||
mov %rcx,8($mac)
|
||||
|
||||
ret
|
||||
RET
|
||||
.size poly1305_emit_base2_44,.-poly1305_emit_base2_44
|
||||
___
|
||||
} } }
|
||||
@ -3916,7 +3916,7 @@ xor128_encrypt_n_pad:
|
||||
|
||||
.Ldone_enc:
|
||||
mov $otp,%rax
|
||||
ret
|
||||
RET
|
||||
.size xor128_encrypt_n_pad,.-xor128_encrypt_n_pad
|
||||
|
||||
.globl xor128_decrypt_n_pad
|
||||
@ -3967,7 +3967,7 @@ xor128_decrypt_n_pad:
|
||||
|
||||
.Ldone_dec:
|
||||
mov $otp,%rax
|
||||
ret
|
||||
RET
|
||||
.size xor128_decrypt_n_pad,.-xor128_decrypt_n_pad
|
||||
___
|
||||
}
|
||||
@ -4109,7 +4109,7 @@ avx_handler:
|
||||
pop %rbx
|
||||
pop %rdi
|
||||
pop %rsi
|
||||
ret
|
||||
RET
|
||||
.size avx_handler,.-avx_handler
|
||||
|
||||
.section .pdata
|
||||
|
Loading…
Reference in New Issue
Block a user