crypto: arm/aes-ce - fix broken monolithic build
authorArd Biesheuvel <ard.biesheuvel@linaro.org>
Tue, 29 Nov 2016 13:05:30 +0000 (13:05 +0000)
committerHerbert Xu <herbert@gondor.apana.org.au>
Wed, 30 Nov 2016 12:01:41 +0000 (20:01 +0800)
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: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
arch/arm64/crypto/aes-glue.c

index 24f6137c1a6ec4d0989753d3788f2677a3c4c2db..5c43b92b3714079ac22239e3ce4eb93fa1fe45c1 100644 (file)
@@ -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)
 {