Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[linux-2.6-omap-h63xx.git] / arch / powerpc / boot / string.S

diff --git a/arch/powerpc/boot/string.S b/arch/powerpc/boot/string.S
index 2627558bcb7132cc30a7944752068264beeb0cbb..acc9428f27897d80db4cd65430fedf1069adbe6c 100644 (file)
--- a/arch/powerpc/boot/string.S
+++ b/arch/powerpc/boot/string.S
@@ -219,10 +219,23 @@ backwards_memcpy:
        mtctr   r7
        b       1b
 
+       .globl  memchr
+memchr:
+       cmpwi   0,r5,0
+       blelr
+       mtctr   r5
+       addi    r3,r3,-1
+1:     lbzu    r0,1(r3)
+       cmpw    r0,r4
+       beqlr
+       bdnz    1b
+       li      r3,0
+       blr
+
        .globl  memcmp
 memcmp:
        cmpwi   0,r5,0
-       blelr
+       ble     2f
        mtctr   r5
        addi    r6,r3,-1
        addi    r4,r4,-1
@@ -231,6 +244,8 @@ memcmp:
        subf.   r3,r0,r3
        bdnzt   2,1b
        blr
+2:     li      r3,0
+       blr
 
 
 /*