Merge branch 'processor-procfs-2.6.32' into release

[sfrench/cifs-2.6.git] / arch / arm / lib / io-writesw-armv4.S

diff --git a/arch/arm/lib/io-writesw-armv4.S b/arch/arm/lib/io-writesw-armv4.S
index d6585612c86b5676d8fc9213426ab2a348e467c3..ff4f71b579eeb454a3bba5b01120c0ee06ae3f47 100644 (file)
--- a/arch/arm/lib/io-writesw-armv4.S
+++ b/arch/arm/lib/io-writesw-armv4.S
@@ -75,7 +75,10 @@ ENTRY(__raw_writesw)
 #endif
 
 .Loutsw_noalign:
-               ldr     r3, [r1, -r3]!
+ ARM(          ldr     r3, [r1, -r3]!  )
+ THUMB(                rsb     r3, r3, #0      )
+ THUMB(                ldr     r3, [r1, r3]    )
+ THUMB(                sub     r1, r3          )
                subcs   r2, r2, #1
                bcs     2f
                subs    r2, r2, #2