summaryrefslogtreecommitdiffstats
path: root/arch/cris/arch-v32
diff options
context:
space:
mode:
authorRabin Vincent <rabin@rab.in>2015-02-19 21:36:55 +0100
committerJesper Nilsson <jespern@axis.com>2015-09-05 00:56:49 +0200
commit444e0c2881bcc70db6833d9c653c6ced36813d3b (patch)
tree49a9229250dd0772fabe063b691d80273b882ad2 /arch/cris/arch-v32
parentCRIS: UAPI: use generic types.h (diff)
downloadlinux-444e0c2881bcc70db6833d9c653c6ced36813d3b.tar.xz
linux-444e0c2881bcc70db6833d9c653c6ced36813d3b.zip
CRISv32: add support for irqflags tracing
Add support irqflags tracing, which is required for things like lockdep and ftrace. Signed-off-by: Rabin Vincent <rabin@rab.in> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Diffstat (limited to 'arch/cris/arch-v32')
-rw-r--r--arch/cris/arch-v32/kernel/entry.S11
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/cris/arch-v32/kernel/entry.S b/arch/cris/arch-v32/kernel/entry.S
index 1c5595a6ceb5..b17a20999f87 100644
--- a/arch/cris/arch-v32/kernel/entry.S
+++ b/arch/cris/arch-v32/kernel/entry.S
@@ -240,6 +240,17 @@ ret_from_sys_call:
.type _Rexit,@function
_Rexit:
+#if defined(CONFIG_TRACE_IRQFLAGS)
+ addoq +PT_ccs, $sp, $acr
+ move.d [$acr], $r0
+ btstq 15, $r0 ; I1
+ bpl 1f
+ nop
+ jsr trace_hardirqs_on
+ nop
+1:
+#endif
+
;; This epilogue MUST match the prologues in multiple_interrupt, irq.h
;; and ptregs.h.
addq 4, $sp ; Skip orig_r10.