From patchwork Tue Nov 29 13:05:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 9451979 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 25F0060710 for ; Tue, 29 Nov 2016 13:05:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 18E5728319 for ; Tue, 29 Nov 2016 13:05:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0DA2C28330; Tue, 29 Nov 2016 13:05:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A0B2528339 for ; Tue, 29 Nov 2016 13:05:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933392AbcK2NFk (ORCPT ); Tue, 29 Nov 2016 08:05:40 -0500 Received: from mail-wm0-f54.google.com ([74.125.82.54]:37383 "EHLO mail-wm0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933366AbcK2NFj (ORCPT ); Tue, 29 Nov 2016 08:05:39 -0500 Received: by mail-wm0-f54.google.com with SMTP id t79so186841253wmt.0 for ; Tue, 29 Nov 2016 05:05:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=LlEli3gpGlS0rZcM3J4CUG13Up9ySy7HCHHmxdIy6vg=; b=JN4THeyBdM4Au65KGZw7e5j0a6WzriaQH9PAgPqmqQ3+KSQSuyDD9IWbCe/zuPuHSW GP7Sjytx4E2sr1BXRsiZUT52Fk5ZNrijYj5Hp1/889ME0mG3DPTrh7Ze9wbFI/hXlOov Fpdo2vR4g7hB7sRpnnOGMvko8oK85o41TFrXc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=LlEli3gpGlS0rZcM3J4CUG13Up9ySy7HCHHmxdIy6vg=; b=YVQW57ZYUwsA53TOIQzrZsFOk3hNxsudMc3ccabIsscvHCXwyJPyt83L74+5ofqH1I ihVcT3wGpxQEsJaP0sN7B/ZNOcWGEcshf5y0m5c2Ec4vh2tIXn6w2HDD4VyPprMsrdDj JULRPRf7lVLdTpFYM64kMEJdglGRn1nPAEfJFjBVe9o5K15A5+uvqSHQuA51wa10wv7J wL56SREDczLObXeEywqY+LjNoJPOjf+VzQEuztJ/BLdLgqbZa1GZ5rEyINGLPqmFN7aN J3LMN+lKeBr0y6Tudd9CYCIe8bY+JVJ+0WGGoDaBFIfKM6YxNosIRTTMdcZpd55ty/qZ UUgA== X-Gm-Message-State: AKaTC02/PbvsjA0aRKSrHrLxuZT10h7b5qW6QG1beY/jjXCAY0vt4txC2uzuL1pHA22AI3rl X-Received: by 10.28.189.196 with SMTP id n187mr25583151wmf.133.1480424737845; Tue, 29 Nov 2016 05:05:37 -0800 (PST) Received: from localhost.localdomain ([105.138.199.36]) by smtp.gmail.com with ESMTPSA id n5sm2749312wmf.0.2016.11.29.05.05.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Nov 2016 05:05:37 -0800 (PST) From: Ard Biesheuvel To: linux-crypto@vger.kernel.org, herbert@gondor.apana.org.au Cc: linux-arm-kernel@lists.infradead.org, Ard Biesheuvel Subject: [PATCH 1/4] crypto: arm/aes-ce: fix broken monolithic build Date: Tue, 29 Nov 2016 13:05:30 +0000 Message-Id: <1480424733-10797-1-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- arch/arm64/crypto/aes-glue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) {