diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2016-11-29 14:05:30 +0100 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-11-30 13:01:41 +0100 |
| commit | 7f329c17427ba517a9f6aa37133c73ff19bec5fb (patch) | |
| tree | bf24a4c34acb077128e31003635014fe7d2c2e7e /arch/arm64/crypto | |
| parent | crypto: arm/aes - Add missing SIMD select for aesbs (diff) | |
| download | linux-7f329c17427ba517a9f6aa37133c73ff19bec5fb.tar.xz linux-7f329c17427ba517a9f6aa37133c73ff19bec5fb.zip | |
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: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'arch/arm64/crypto')
| -rw-r--r-- | arch/arm64/crypto/aes-glue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/crypto/aes-glue.c b/arch/arm64/crypto/aes-glue.c index 24f6137c1a6e..5c43b92b3714 100644 --- a/arch/arm64/crypto/aes-glue.c +++ b/arch/arm64/crypto/aes-glue.c @@ -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) { |