diff options
| author | Colin Cross <ccross@android.com> | 2010-12-21 18:34:37 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2010-12-21 18:34:37 -0800 |
| commit | b104a07edb2a319f734ddc4fe04852865d8d9e24 (patch) | |
| tree | a0cd50b3d84ece4d94e366fac4b440e380c2d247 /arch/arm/lib | |
| parent | e87ec4d59e1f96381547e614c5279bed63775719 (diff) | |
| parent | a1346c99fc89f2b3d35c7d7e2e4aef8ea4124342 (diff) | |
Merge commit 'v2.6.36.2' into linux-tegra-2.6.36
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/findbit.S | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/lib/findbit.S b/arch/arm/lib/findbit.S index 1e4cbd4e7be9..64f6bc1a9132 100644 --- 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 r1, r3, #0 - and r3, r3, r1 + rsb r0, r3, #0 + and r3, r3, r0 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 |