diff options
| author | Rabin Vincent <rabin@rab.in> | 2015-02-19 21:36:55 +0100 |
|---|---|---|
| committer | Jesper Nilsson <jespern@axis.com> | 2015-09-05 00:56:49 +0200 |
| commit | 444e0c2881bcc70db6833d9c653c6ced36813d3b (patch) | |
| tree | 49a9229250dd0772fabe063b691d80273b882ad2 /arch/cris | |
| parent | 20ae24739968ae7f94d0e73215d444042f91df78 (diff) | |
| download | talos-obmc-linux-444e0c2881bcc70db6833d9c653c6ced36813d3b.tar.gz talos-obmc-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')
| -rw-r--r-- | arch/cris/Kconfig | 4 | ||||
| -rw-r--r-- | arch/cris/arch-v32/kernel/entry.S | 11 | ||||
| -rw-r--r-- | arch/cris/kernel/irq.c | 6 |
3 files changed, 20 insertions, 1 deletions
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index b202b8277a26..e7ba2d4bdd4f 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig @@ -36,6 +36,10 @@ config FORCE_MAX_ZONEORDER int default 6 +config TRACE_IRQFLAGS_SUPPORT + depends on ETRAX_ARCH_V32 + def_bool y + config CRIS bool default y 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. diff --git a/arch/cris/kernel/irq.c b/arch/cris/kernel/irq.c index dd0be5de55d5..694850e8f077 100644 --- a/arch/cris/kernel/irq.c +++ b/arch/cris/kernel/irq.c @@ -45,7 +45,11 @@ asmlinkage void do_IRQ(int irq, struct pt_regs * regs) { unsigned long sp; - struct pt_regs *old_regs = set_irq_regs(regs); + struct pt_regs *old_regs; + + trace_hardirqs_off(); + + old_regs = set_irq_regs(regs); irq_enter(); sp = rdsp(); if (unlikely((sp & (PAGE_SIZE - 1)) < (PAGE_SIZE/8))) { |
