From patchwork Wed Jul 20 14:32:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herbert Xu X-Patchwork-Id: 9239697 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 7332A6077C for ; Wed, 20 Jul 2016 14:33:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6480A268AE for ; Wed, 20 Jul 2016 14:33:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 578BE27BF7; Wed, 20 Jul 2016 14:33:06 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 A2D9D268AE for ; Wed, 20 Jul 2016 14:33:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754151AbcGTOdC (ORCPT ); Wed, 20 Jul 2016 10:33:02 -0400 Received: from helcar.hengli.com.au ([209.40.204.226]:35820 "EHLO helcar.hengli.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753986AbcGTOdB (ORCPT ); Wed, 20 Jul 2016 10:33:01 -0400 Received: from gondolin.me.apana.org.au ([192.168.0.6]) by norbury.hengli.com.au with esmtp (Exim 4.80 #3 (Debian)) id 1bPsYQ-0006Kg-Q9; Thu, 21 Jul 2016 00:32:54 +1000 Received: from herbert by gondolin.me.apana.org.au with local (Exim 4.80) (envelope-from ) id 1bPsYN-0000sx-1x; Wed, 20 Jul 2016 22:32:51 +0800 Date: Wed, 20 Jul 2016 22:32:50 +0800 From: Herbert Xu To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Paulo Flabiano Smorigo , "Leonidas S. Barbosa" , Linux Crypto Mailing List Subject: Re: linux-next: build failure after merge of the crypto tree Message-ID: <20160720143250.GA3323@gondor.apana.org.au> References: <20160720174634.53bad636@canb.auug.org.au> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20160720174634.53bad636@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) 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 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. ---8<--- 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 diff --git a/drivers/crypto/vmx/aesp8-ppc.pl b/drivers/crypto/vmx/aesp8-ppc.pl index 813ffcc..0b4a293 100644 --- a/drivers/crypto/vmx/aesp8-ppc.pl +++ b/drivers/crypto/vmx/aesp8-ppc.pl @@ -2125,8 +2125,6 @@ Lxts_enc_ret: .size .${prefix}_xts_encrypt,.-.${prefix}_xts_encrypt .globl .${prefix}_xts_decrypt -.align 5 -.${prefix}_xts_decrypt: mr $inp,r3 # reassign li r3,-1 ${UCMP}i $len,16