diff options
| author | Jussi Kivilinna <jussi.kivilinna@iki.fi> | 2013-09-03 09:49:47 -0400 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2013-09-13 07:43:52 -0400 |
| commit | 58497204aaca75c53394ff2dee6603315b8a2ea4 (patch) | |
| tree | e9872712e838159c30120ab68296778734f77476 /arch/x86 | |
| parent | 7d444909a25ed4a9dbc546bf9528c8d2e3bf3752 (diff) | |
crypto: x86 - restore avx2_supported check
Commit 3d387ef08c4 (Revert "crypto: blowfish - add AVX2/x86_64 implementation
of blowfish cipher") reverted too much as it removed the 'assembler supports
AVX2' check and therefore disabled remaining AVX2 implementations of Camellia
and Serpent. Patch restores the check and enables these implementations.
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/crypto/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/crypto/Makefile b/arch/x86/crypto/Makefile index 7d6ba9db1be9..75b08e1e69db 100644 --- a/arch/x86/crypto/Makefile +++ b/arch/x86/crypto/Makefile | |||
| @@ -3,6 +3,8 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | avx_supported := $(call as-instr,vpxor %xmm0$(comma)%xmm0$(comma)%xmm0,yes,no) | 5 | avx_supported := $(call as-instr,vpxor %xmm0$(comma)%xmm0$(comma)%xmm0,yes,no) |
| 6 | avx2_supported := $(call as-instr,vpgatherdd %ymm0$(comma)(%eax$(comma)%ymm1\ | ||
| 7 | $(comma)4)$(comma)%ymm2,yes,no) | ||
| 6 | 8 | ||
| 7 | obj-$(CONFIG_CRYPTO_ABLK_HELPER_X86) += ablk_helper.o | 9 | obj-$(CONFIG_CRYPTO_ABLK_HELPER_X86) += ablk_helper.o |
| 8 | obj-$(CONFIG_CRYPTO_GLUE_HELPER_X86) += glue_helper.o | 10 | obj-$(CONFIG_CRYPTO_GLUE_HELPER_X86) += glue_helper.o |