Hi all, On Thu, 22 Jun 2017 10:56:48 -0400 (EDT) David Miller <davem@xxxxxxxxxxxxx> 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 <davem@xxxxxxxxxxxxx> > > 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 -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
