diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2020-03-26 09:00:55 +0100 |
|---|---|---|
| committer | Masahiro Yamada <masahiroy@kernel.org> | 2020-04-08 17:01:59 +0200 |
| commit | 42251572c4687813d8e7b1d363a23d0f9201e69f (patch) | |
| tree | b6321c02de1b4950ebb8dc4015b9cc0ca72e4b29 /arch/x86/crypto/sha1_ssse3_glue.c | |
| parent | x86: remove always-defined CONFIG_AS_SSSE3 (diff) | |
| download | linux-42251572c4687813d8e7b1d363a23d0f9201e69f.tar.xz linux-42251572c4687813d8e7b1d363a23d0f9201e69f.zip | |
x86: remove always-defined CONFIG_AS_AVX
CONFIG_AS_AVX was introduced by commit ea4d26ae24e5 ("raid5: add AVX
optimized RAID5 checksumming").
We raise the minimal supported binutils version from time to time.
The last bump was commit 1fb12b35e5ff ("kbuild: Raise the minimum
required binutils version to 2.21").
I confirmed the code in $(call as-instr,...) can be assembled by the
binutils 2.21 assembler and also by LLVM integrated assembler.
Remove CONFIG_AS_AVX, which is always defined.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Jason A. Donenfeld <Jason@zx2c4.com>
Acked-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/crypto/sha1_ssse3_glue.c')
| -rw-r--r-- | arch/x86/crypto/sha1_ssse3_glue.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/x86/crypto/sha1_ssse3_glue.c b/arch/x86/crypto/sha1_ssse3_glue.c index d70b40ad594c..275b65dd30c9 100644 --- a/arch/x86/crypto/sha1_ssse3_glue.c +++ b/arch/x86/crypto/sha1_ssse3_glue.c @@ -114,7 +114,6 @@ static void unregister_sha1_ssse3(void) crypto_unregister_shash(&sha1_ssse3_alg); } -#ifdef CONFIG_AS_AVX asmlinkage void sha1_transform_avx(struct sha1_state *state, const u8 *data, int blocks); @@ -175,13 +174,7 @@ static void unregister_sha1_avx(void) crypto_unregister_shash(&sha1_avx_alg); } -#else /* CONFIG_AS_AVX */ -static inline int register_sha1_avx(void) { return 0; } -static inline void unregister_sha1_avx(void) { } -#endif /* CONFIG_AS_AVX */ - - -#if defined(CONFIG_AS_AVX2) && (CONFIG_AS_AVX) +#if defined(CONFIG_AS_AVX2) #define SHA1_AVX2_BLOCK_OPTSIZE 4 /* optimal 4*64 bytes of SHA1 blocks */ asmlinkage void sha1_transform_avx2(struct sha1_state *state, |