diff options
author | Tim Chen <tim.c.chen@linux.intel.com> | 2014-01-09 11:57:42 -0500 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2014-01-14 22:36:34 -0500 |
commit | 79ba451d66ca8402c8d052ceb50e359ddc5e1161 (patch) | |
tree | 23953c81987d74a33f1ee95a2491fb1d889ba0cc /arch/x86/crypto | |
parent | fe70be5c8885d07a5c12f3ad97e6f226b0e8cae3 (diff) |
crypto: aesni - fix build on x86 (32bit)
We rename aesni-intel_avx.S to aesni-intel_avx-x86_64.S to indicate
that it is only used by x86_64 architecture.
Signed-off-by: Tim Chen <tim.c.chen@linux.intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'arch/x86/crypto')
-rw-r--r-- | arch/x86/crypto/Makefile | 2 | ||||
-rw-r--r-- | arch/x86/crypto/aesni-intel_avx-x86_64.S (renamed from arch/x86/crypto/aesni-intel_avx.S) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/crypto/Makefile b/arch/x86/crypto/Makefile index 188b993e55c7..6ba54d640383 100644 --- a/arch/x86/crypto/Makefile +++ b/arch/x86/crypto/Makefile | |||
@@ -76,7 +76,7 @@ ifeq ($(avx2_supported),yes) | |||
76 | endif | 76 | endif |
77 | 77 | ||
78 | aesni-intel-y := aesni-intel_asm.o aesni-intel_glue.o fpu.o | 78 | aesni-intel-y := aesni-intel_asm.o aesni-intel_glue.o fpu.o |
79 | aesni-intel-$(CONFIG_64BIT) += aesni-intel_avx.o | 79 | aesni-intel-$(CONFIG_64BIT) += aesni-intel_avx-x86_64.o |
80 | ghash-clmulni-intel-y := ghash-clmulni-intel_asm.o ghash-clmulni-intel_glue.o | 80 | ghash-clmulni-intel-y := ghash-clmulni-intel_asm.o ghash-clmulni-intel_glue.o |
81 | sha1-ssse3-y := sha1_ssse3_asm.o sha1_ssse3_glue.o | 81 | sha1-ssse3-y := sha1_ssse3_asm.o sha1_ssse3_glue.o |
82 | crc32c-intel-y := crc32c-intel_glue.o | 82 | crc32c-intel-y := crc32c-intel_glue.o |
diff --git a/arch/x86/crypto/aesni-intel_avx.S b/arch/x86/crypto/aesni-intel_avx-x86_64.S index 522ab68d1c88..522ab68d1c88 100644 --- a/arch/x86/crypto/aesni-intel_avx.S +++ b/arch/x86/crypto/aesni-intel_avx-x86_64.S | |||