From da3bc26599c403692536546d4e003bb8897e721a Mon Sep 17 00:00:00 2001 From: Sami Tolvanen Date: Fri, 2 Mar 2018 13:20:40 -0800 Subject: [PATCH] ANDROID: arm64: crypto: fix AES CE when built as a module Rename aes-cipher.c to aes-cipher-glue.c according to existing naming convention, and make sure aes-cipher-core.c is linked into the module. Bug: 67506682 Change-Id: I63671937207cc192d8f9cbef3232841d9e30022b Signed-off-by: Sami Tolvanen --- arch/arm64/crypto/Makefile | 3 ++- arch/arm64/crypto/{aes-ce-cipher.c => aes-ce-cipher-glue.c} | 0 2 files changed, 2 insertions(+), 1 deletion(-) rename arch/arm64/crypto/{aes-ce-cipher.c => aes-ce-cipher-glue.c} (100%) diff --git a/arch/arm64/crypto/Makefile b/arch/arm64/crypto/Makefile index a4a8b17a5e2a..550e02a5aa32 100644 --- a/arch/arm64/crypto/Makefile +++ b/arch/arm64/crypto/Makefile @@ -17,7 +17,8 @@ sha2-ce-y := sha2-ce-glue.o sha2-ce-core.o obj-$(CONFIG_CRYPTO_GHASH_ARM64_CE) += ghash-ce.o ghash-ce-y := ghash-ce-glue.o ghash-ce-core.o -obj-$(CONFIG_CRYPTO_AES_ARM64_CE) += aes-ce-cipher.o aes-ce-cipher-core.o +obj-$(CONFIG_CRYPTO_AES_ARM64_CE) += aes-ce-cipher.o +aes-ce-cipher-y := aes-ce-cipher-glue.o aes-ce-cipher-core.o CFLAGS_aes-ce-cipher-core.o += -march=armv8-a+crypto -Wa,-march=armv8-a+crypto $(DISABLE_LTO) obj-$(CONFIG_CRYPTO_AES_ARM64_CE_CCM) += aes-ce-ccm.o diff --git a/arch/arm64/crypto/aes-ce-cipher.c b/arch/arm64/crypto/aes-ce-cipher-glue.c similarity index 100% rename from arch/arm64/crypto/aes-ce-cipher.c rename to arch/arm64/crypto/aes-ce-cipher-glue.c