Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f329c17 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Herbert Xu
Browse files

crypto: arm/aes-ce - fix broken monolithic build 



When building the arm64 kernel with both CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
and CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y configured, the build breaks with
the following error:

arch/arm64/crypto/aes-neon-blk.o:(.bss+0x0): multiple definition of `aes_simd_algs'
arch/arm64/crypto/aes-ce-blk.o:(.bss+0x0): first defined here

Fix this by making aes_simd_algs 'static'.

Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 6fdf436f

arch/arm64/crypto/aes-glue.c

+1 −1
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ static struct skcipher_alg aes_algs[] = { { 
	.decrypt	= xts_decrypt,

} };



struct simd_skcipher_alg *aes_simd_algs[ARRAY_SIZE(aes_algs)];

static struct simd_skcipher_alg *aes_simd_algs[ARRAY_SIZE(aes_algs)];



static void aes_exit(void)

{