aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/crypto/sha1_ssse3_asm.S
diff options
context:
space:
mode:
authorMathias Krause <minipli@googlemail.com>2012-05-24 11:13:42 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2012-06-12 16:37:16 +0800
commit65df57743924c3d13e1fa1bcf5bf70fe874fcdfd (patch)
tree122291d27b0ea9aeed2e1e454a62f83a8aed3aa5 /arch/x86/crypto/sha1_ssse3_asm.S
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (diff)
downloadlinux-dev-65df57743924c3d13e1fa1bcf5bf70fe874fcdfd.tar.xz
linux-dev-65df57743924c3d13e1fa1bcf5bf70fe874fcdfd.zip
crypto: sha1 - use Kbuild supplied flags for AVX test
Commit ea4d26ae ("raid5: add AVX optimized RAID5 checksumming") introduced x86/ arch wide defines for AFLAGS and CFLAGS indicating AVX support in binutils based on the same test we have in x86/crypto/ right now. To minimize duplication drop our implementation in favour to the one in x86/. Signed-off-by: Mathias Krause <minipli@googlemail.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'arch/x86/crypto/sha1_ssse3_asm.S')
-rw-r--r--arch/x86/crypto/sha1_ssse3_asm.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S
index b2c2f57d70e8..49d6987a73d9 100644
--- a/arch/x86/crypto/sha1_ssse3_asm.S
+++ b/arch/x86/crypto/sha1_ssse3_asm.S
@@ -468,7 +468,7 @@ W_PRECALC_SSSE3
*/
SHA1_VECTOR_ASM sha1_transform_ssse3
-#ifdef SHA1_ENABLE_AVX_SUPPORT
+#ifdef CONFIG_AS_AVX
.macro W_PRECALC_AVX