diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-04 13:59:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-04 13:59:40 +0200 |
| commit | 64edbc562034f2ec3fce382cb208fab40586d005 (patch) | |
| tree | 7fbfaaea9467d14a1a6ac5667ce01be5ccb9b635 /include/trace/events | |
| parent | 43bd1236234cacbc18d1476a9b57e7a306efddf5 (diff) | |
| parent | 0f6ce3de4ef6ff940308087c49760d068851c1a7 (diff) | |
| download | op-kernel-dev-64edbc562034f2ec3fce382cb208fab40586d005.zip op-kernel-dev-64edbc562034f2ec3fce382cb208fab40586d005.tar.gz | |
Merge branch 'tracing/ftrace' into tracing/core
Merge reason: this mini-topic had outstanding problems that delayed
its merge, so it does not fast-forward.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/trace/events')
| -rw-r--r-- | include/trace/events/irq.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h index 683fb36..b0c7ede 100644 --- a/include/trace/events/irq.h +++ b/include/trace/events/irq.h @@ -7,18 +7,18 @@ #undef TRACE_SYSTEM #define TRACE_SYSTEM irq -#define softirq_name(sirq) { sirq, #sirq } -#define show_softirq_name(val) \ - __print_symbolic(val, \ - softirq_name(HI_SOFTIRQ), \ - softirq_name(TIMER_SOFTIRQ), \ - softirq_name(NET_TX_SOFTIRQ), \ - softirq_name(NET_RX_SOFTIRQ), \ - softirq_name(BLOCK_SOFTIRQ), \ - softirq_name(TASKLET_SOFTIRQ), \ - softirq_name(SCHED_SOFTIRQ), \ - softirq_name(HRTIMER_SOFTIRQ), \ - softirq_name(RCU_SOFTIRQ)) +#define softirq_name(sirq) { sirq##_SOFTIRQ, #sirq } +#define show_softirq_name(val) \ + __print_symbolic(val, \ + softirq_name(HI), \ + softirq_name(TIMER), \ + softirq_name(NET_TX), \ + softirq_name(NET_RX), \ + softirq_name(BLOCK), \ + softirq_name(TASKLET), \ + softirq_name(SCHED), \ + softirq_name(HRTIMER), \ + softirq_name(RCU)) /** * irq_handler_entry - called immediately before the irq action handler |
