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 'rbd-sysfs' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
[pandora-kernel.git]
/
arch
/
arm
/
lib
/
findbit.S
diff --git
a/arch/arm/lib/findbit.S
b/arch/arm/lib/findbit.S
index
1e4cbd4
..
64f6bc1
100644
(file)
--- a/
arch/arm/lib/findbit.S
+++ b/
arch/arm/lib/findbit.S
@@
-174,8
+174,8
@@
ENDPROC(_find_next_bit_be)
*/
.L_found:
#if __LINUX_ARM_ARCH__ >= 5
- rsb r
1
, r3, #0
- and r3, r3, r
1
+ rsb r
0
, r3, #0
+ and r3, r3, r
0
clz r3, r3
rsb r3, r3, #31
add r0, r2, r3
@@
-190,5
+190,7
@@
ENDPROC(_find_next_bit_be)
addeq r2, r2, #1
mov r0, r2
#endif
+ cmp r1, r0 @ Clamp to maxbit
+ movlo r0, r1
mov pc, lr