diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
| commit | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (patch) | |
| tree | d827bca3fc825a0ac33efbcd493713be40fcc812 /arch/arm/lib/ashldi3.S | |
| parent | cf7a2b4fb6a9b86779930a0a123b0df41aa9208f (diff) | |
| parent | f17a1f06d2fa93f4825be572622eb02c4894db4e (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
MAINTAINERS
arch/arm/mm/fault.c
Diffstat (limited to 'arch/arm/lib/ashldi3.S')
| -rw-r--r-- | arch/arm/lib/ashldi3.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/lib/ashldi3.S b/arch/arm/lib/ashldi3.S index 1154d924080b..638deb13da1c 100644 --- a/arch/arm/lib/ashldi3.S +++ b/arch/arm/lib/ashldi3.S | |||
| @@ -43,7 +43,9 @@ ENTRY(__aeabi_llsl) | |||
| 43 | rsb ip, r2, #32 | 43 | rsb ip, r2, #32 |
| 44 | movmi ah, ah, lsl r2 | 44 | movmi ah, ah, lsl r2 |
| 45 | movpl ah, al, lsl r3 | 45 | movpl ah, al, lsl r3 |
| 46 | orrmi ah, ah, al, lsr ip | 46 | ARM( orrmi ah, ah, al, lsr ip ) |
| 47 | THUMB( lsrmi r3, al, ip ) | ||
| 48 | THUMB( orrmi ah, ah, r3 ) | ||
| 47 | mov al, al, lsl r2 | 49 | mov al, al, lsl r2 |
| 48 | mov pc, lr | 50 | mov pc, lr |
| 49 | 51 | ||