aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/lib
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-08-15 16:51:48 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-08-15 16:51:48 +0100
commit9b2616c2e8cc98ca98bbb40cad83a8d3d859e840 (patch)
tree5a971fa57298d58529d3ae82b68cbfc7139bde7b /arch/arm/lib
parent590a94d93475fa6cca257f161ae268ed3a2395b5 (diff)
parentac25150f2c55ea26447af0fa1d4e2bb07f97384d (diff)
downloadkernel_samsung_smdk4412-9b2616c2e8cc98ca98bbb40cad83a8d3d859e840.zip
kernel_samsung_smdk4412-9b2616c2e8cc98ca98bbb40cad83a8d3d859e840.tar.gz
kernel_samsung_smdk4412-9b2616c2e8cc98ca98bbb40cad83a8d3d859e840.tar.bz2
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.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/lib/bitops.h b/arch/arm/lib/bitops.h
index c7f2627..d422529 100644
--- a/arch/arm/lib/bitops.h
+++ b/arch/arm/lib/bitops.h
@@ -60,8 +60,8 @@
tst r2, r0, lsl r3
\instr r2, r2, r0, lsl r3
\store r2, [r1]
- restore_irqs ip
moveq r0, #0
+ restore_irqs ip
mov pc, lr
.endm
#endif