Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754502AbdFWGn2 (ORCPT ); Fri, 23 Jun 2017 02:43:28 -0400 Received: from ozlabs.org ([103.22.144.67]:56513 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754223AbdFWGn0 (ORCPT ); Fri, 23 Jun 2017 02:43:26 -0400 Date: Fri, 23 Jun 2017 16:43:23 +1000 From: Stephen Rothwell To: David Miller Cc: npiggin@gmail.com, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, yamada.masahiro@socionext.com, amodra@gmail.com Subject: Re: linux-next: build failure after merge of most trees Message-ID: <20170623164323.2ff81b19@canb.auug.org.au> In-Reply-To: <20170622.105648.1780325804771154563.davem@davemloft.net> References: <20170622184116.0ebaabd9@roar.ozlabs.ibm.com> <20170622.101306.2121302610489503804.davem@davemloft.net> <20170623003339.11cbc062@roar.ozlabs.ibm.com> <20170622.105648.1780325804771154563.davem@davemloft.net> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1881 Lines: 72 Hi all, On Thu, 22 Jun 2017 10:56:48 -0400 (EDT) David Miller wrote: > > Feel free to merge it into your series: > > ==================== > sparc64: Use indirect calls in hamming weight stubs. > > Otherwise, depending upon link order, the branch relocation > limits could be exceeded. > > Signed-off-by: David S. Miller > > diff --git a/arch/sparc/lib/hweight.S b/arch/sparc/lib/hweight.S > index f9985f1..d21cf20 100644 > --- a/arch/sparc/lib/hweight.S > +++ b/arch/sparc/lib/hweight.S > @@ -4,9 +4,9 @@ > .text > .align 32 > ENTRY(__arch_hweight8) > - ba,pt %xcc, __sw_hweight8 > + sethi %hi(__sw_hweight8), %g1 > + jmpl %g1 + %lo(__sw_hweight8), %g0 > nop > - nop > ENDPROC(__arch_hweight8) > EXPORT_SYMBOL(__arch_hweight8) > .section .popc_3insn_patch, "ax" > @@ -17,9 +17,9 @@ EXPORT_SYMBOL(__arch_hweight8) > .previous > > ENTRY(__arch_hweight16) > - ba,pt %xcc, __sw_hweight16 > + sethi %hi(__sw_hweight16), %g1 > + jmpl %g1 + %lo(__sw_hweight16), %g0 > nop > - nop > ENDPROC(__arch_hweight16) > EXPORT_SYMBOL(__arch_hweight16) > .section .popc_3insn_patch, "ax" > @@ -30,9 +30,9 @@ EXPORT_SYMBOL(__arch_hweight16) > .previous > > ENTRY(__arch_hweight32) > - ba,pt %xcc, __sw_hweight32 > + sethi %hi(__sw_hweight32), %g1 > + jmpl %g1 + %lo(__sw_hweight32), %g0 > nop > - nop > ENDPROC(__arch_hweight32) > EXPORT_SYMBOL(__arch_hweight32) > .section .popc_3insn_patch, "ax" > @@ -43,9 +43,9 @@ EXPORT_SYMBOL(__arch_hweight32) > .previous > > ENTRY(__arch_hweight64) > - ba,pt %xcc, __sw_hweight64 > + sethi %hi(__sw_hweight16), %g1 > + jmpl %g1 + %lo(__sw_hweight16), %g0 > nop > - nop > ENDPROC(__arch_hweight64) > EXPORT_SYMBOL(__arch_hweight64) > .section .popc_3insn_patch, "ax" I added that to linux-next today and it fixed the build problem. -- Cheers, Stephen Rothwell