git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
powerpc
/
boot
/
string.S
diff --git
a/arch/powerpc/boot/string.S
b/arch/powerpc/boot/string.S
index
643e4cb
..
acc9428
100644
(file)
--- a/
arch/powerpc/boot/string.S
+++ b/
arch/powerpc/boot/string.S
@@
-235,7
+235,7
@@
memchr:
.globl memcmp
memcmp:
cmpwi 0,r5,0
- ble
lr
+ ble
2f
mtctr r5
addi r6,r3,-1
addi r4,r4,-1
@@
-244,6
+244,8
@@
memcmp:
subf. r3,r0,r3
bdnzt 2,1b
blr
+2: li r3,0
+ blr
/*