summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/lib
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2018-08-21 11:04:12 +1000
committerMichael Ellerman <mpe@ellerman.id.au>2018-09-17 21:17:25 +1000
commitbe54c1216f6689a6eb504e3471d0cb41cc9d9809 (patch)
treeee6cbdf3dd738fc025945aff2b4284a3ca09de58 /arch/powerpc/lib
parentba2dd8a26baa7e140555746d396e32952709c42d (diff)
downloadlinux-be54c1216f6689a6eb504e3471d0cb41cc9d9809.tar.bz2
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>
Diffstat (limited to 'arch/powerpc/lib')
-rw-r--r--arch/powerpc/lib/mem_64.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/lib/mem_64.S b/arch/powerpc/lib/mem_64.S
index ec531de99996..3c3be02f33b7 100644
--- 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