Re: linux-next: build failure after merge of the crypto tree

From: Herbert Xu
Date: Wed Jul 20 2016 - 10:33:11 EST

On Wed, Jul 20, 2016 at 05:46:34PM +1000, Stephen Rothwell wrote:
> Hi all,
> After merging the dax-misc tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> drivers/crypto/vmx/aesp8-ppc.S: Assembler messages:
> drivers/crypto/vmx/aesp8-ppc.S:2036: Error: symbol `.aes_p8_xts_decrypt' is already defined
> Caused by commit
> 11c6e16ee13a ("crypto: vmx - Adding asm subroutines for XTS")
> I have reverted that commit (and commit c07f5d3da643 ("crypto: vmx -
> Adding support for XTS")) for today.

Thanks Stephen. I think this patch should fix it.

Subject: crypto: vmx - Fix aes_p8_xts_decrypt build failure

We use _GLOBAL so there is no need to do the manual alignment,
in fact it causes a build failure.

Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>

diff --git a/drivers/crypto/vmx/ b/drivers/crypto/vmx/
index 813ffcc..0b4a293 100644
--- a/drivers/crypto/vmx/
+++ b/drivers/crypto/vmx/
@@ -2125,8 +2125,6 @@ Lxts_enc_ret:
.size .${prefix}_xts_encrypt,.-.${prefix}_xts_encrypt

.globl .${prefix}_xts_decrypt
-.align 5
mr $inp,r3 # reassign
li r3,-1
${UCMP}i $len,16
Email: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Home Page:
PGP Key: