diff options
| author | Herbert Xu | 2017-08-22 08:53:32 +0200 |
|---|---|---|
| committer | Herbert Xu | 2017-08-22 08:53:32 +0200 |
| commit | e90c48efde40f8428777424e6edbbb240b441652 (patch) | |
| tree | c023a7a8fa0255f03040c63a73068eaaca03f1af /arch/x86/crypto/sha1_ssse3_glue.c | |
| parent | crypto: ccp - use dma_mapping_error to check map error (diff) | |
| parent | crypto: algif_skcipher - only call put_page on referenced and used pages (diff) | |
| download | kernel-qcow2-linux-e90c48efde40f8428777424e6edbbb240b441652.tar.gz kernel-qcow2-linux-e90c48efde40f8428777424e6edbbb240b441652.tar.xz kernel-qcow2-linux-e90c48efde40f8428777424e6edbbb240b441652.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to resolve the conflict between the temporary
and long-term fixes in algif_skcipher.
Diffstat (limited to 'arch/x86/crypto/sha1_ssse3_glue.c')
| -rw-r--r-- | arch/x86/crypto/sha1_ssse3_glue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/crypto/sha1_ssse3_glue.c b/arch/x86/crypto/sha1_ssse3_glue.c index f960a043cdeb..fc61739150e7 100644 --- a/arch/x86/crypto/sha1_ssse3_glue.c +++ b/arch/x86/crypto/sha1_ssse3_glue.c @@ -201,7 +201,7 @@ asmlinkage void sha1_transform_avx2(u32 *digest, const char *data, static bool avx2_usable(void) { - if (false && avx_usable() && boot_cpu_has(X86_FEATURE_AVX2) + if (avx_usable() && boot_cpu_has(X86_FEATURE_AVX2) && boot_cpu_has(X86_FEATURE_BMI1) && boot_cpu_has(X86_FEATURE_BMI2)) return true; |