diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-08-15 11:51:48 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-08-15 11:51:48 -0400 |
| commit | 9b2616c2e8cc98ca98bbb40cad83a8d3d859e840 (patch) | |
| tree | 5a971fa57298d58529d3ae82b68cbfc7139bde7b /arch/arm/lib | |
| parent | 590a94d93475fa6cca257f161ae268ed3a2395b5 (diff) | |
| parent | ac25150f2c55ea26447af0fa1d4e2bb07f97384d (diff) | |
Merge branch 'for-rmk-2.6.32' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/bitops.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/lib/bitops.h b/arch/arm/lib/bitops.h index c7f2627385e7..d42252918bfb 100644 --- a/arch/arm/lib/bitops.h +++ b/arch/arm/lib/bitops.h | |||
| @@ -60,8 +60,8 @@ | |||
| 60 | tst r2, r0, lsl r3 | 60 | tst r2, r0, lsl r3 |
| 61 | \instr r2, r2, r0, lsl r3 | 61 | \instr r2, r2, r0, lsl r3 |
| 62 | \store r2, [r1] | 62 | \store r2, [r1] |
| 63 | restore_irqs ip | ||
| 64 | moveq r0, #0 | 63 | moveq r0, #0 |
| 64 | restore_irqs ip | ||
| 65 | mov pc, lr | 65 | mov pc, lr |
| 66 | .endm | 66 | .endm |
| 67 | #endif | 67 | #endif |