powerpc/64: Remove static branch hints from memset()

Static branch hints override dynamic branch prediction on recent
POWER CPUs. We should only use them when we are overwhelmingly
sure of the direction.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/lib/mem_64.S b/arch/powerpc/lib/mem_64.S
index ec531de99996260b2f649034a781b486dbaba819..3c3be02f33b7cb12bf14e7bbe5b554b1967c1eb9 100644 (file)
--- a/arch/powerpc/lib/mem_64.S
+++ b/arch/powerpc/lib/mem_64.S
@@ -40,7 +40,7 @@ _GLOBAL(memset)
 .Lms:  PPC_MTOCRF(1,r0)
        mr      r6,r3
        blt     cr1,8f
-       beq+    3f                      /* if already 8-byte aligned */
+       beq     3f                      /* if already 8-byte aligned */
        subf    r5,r0,r5
        bf      31,1f
        stb     r4,0(r6)
@@ -85,7 +85,7 @@ _GLOBAL(memset)
        addi    r6,r6,8
 8:     cmpwi   r5,0
        PPC_MTOCRF(1,r5)
-       beqlr+
+       beqlr
        bf      29,9f
        stw     r4,0(r6)
        addi    r6,r6,4