aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/lib/bitops.h
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2009-08-13 20:38:17 +0200
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>2009-08-13 20:34:37 +0200
commit0d928b0b616d1c5c5fe76019a87cba171ca91633 (patch)
treedb71283925be4df3ea3cf66f9a3eab5f4f349a06 /arch/arm/lib/bitops.h
parent181f817eaaca4c1f8a9c265d339d2b96de8b245d (diff)
downloadkernel_samsung_smdk4412-0d928b0b616d1c5c5fe76019a87cba171ca91633.zip
kernel_samsung_smdk4412-0d928b0b616d1c5c5fe76019a87cba171ca91633.tar.gz
kernel_samsung_smdk4412-0d928b0b616d1c5c5fe76019a87cba171ca91633.tar.bz2
Complete irq tracing support for ARM
Before this patch enabling and disabling irqs in assembler code and by the hardware wasn't tracked completly. I had to transpose two instructions in arch/arm/lib/bitops.h because restore_irqs doesn't preserve the flags with CONFIG_TRACE_IRQFLAGS=y Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Cc: Russell King <linux@arm.linux.org.uk> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ingo Molnar <mingo@redhat.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/lib/bitops.h')
-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