diff options
author | Herbert Xu | 2014-10-02 08:37:20 +0200 |
---|---|---|
committer | Herbert Xu | 2014-10-02 08:37:20 +0200 |
commit | 9561dccb45a34f77001389824915e4dad8ede757 (patch) | |
tree | a16454e64e00c3ea4e42719ecb3b1035da9c463b /arch/x86/crypto | |
parent | crypto: aesni - remove unused defines in "by8" variant (diff) | |
parent | crypto: aesni - disable "by8" AVX CTR optimization (diff) | |
download | kernel-qcow2-linux-9561dccb45a34f77001389824915e4dad8ede757.tar.gz kernel-qcow2-linux-9561dccb45a34f77001389824915e4dad8ede757.tar.xz kernel-qcow2-linux-9561dccb45a34f77001389824915e4dad8ede757.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merging the crypto tree for 3.17 to pull in the "by8" AVX CTR revert.
Diffstat (limited to 'arch/x86/crypto')
-rw-r--r-- | arch/x86/crypto/aesni-intel_glue.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c index 888950f29fd9..a7ccd57f19e4 100644 --- a/arch/x86/crypto/aesni-intel_glue.c +++ b/arch/x86/crypto/aesni-intel_glue.c @@ -481,7 +481,7 @@ static void ctr_crypt_final(struct crypto_aes_ctx *ctx, crypto_inc(ctrblk, AES_BLOCK_SIZE); } -#ifdef CONFIG_AS_AVX +#if 0 /* temporary disabled due to failing crypto tests */ static void aesni_ctr_enc_avx_tfm(struct crypto_aes_ctx *ctx, u8 *out, const u8 *in, unsigned int len, u8 *iv) { @@ -1522,7 +1522,7 @@ static int __init aesni_init(void) aesni_gcm_dec_tfm = aesni_gcm_dec; } aesni_ctr_enc_tfm = aesni_ctr_enc; -#ifdef CONFIG_AS_AVX +#if 0 /* temporary disabled due to failing crypto tests */ if (cpu_has_avx) { /* optimize performance of ctr mode encryption transform */ aesni_ctr_enc_tfm = aesni_ctr_enc_avx_tfm; |