diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-07-01 10:28:42 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-07-01 10:28:46 +0200 |
| commit | 10e6962765f8213941eaa1cbb9de425ff0689e2e (patch) | |
| tree | c277e4ac5b2b7156152454578c39e90da5127dd8 /include/trace/events/irq.h | |
| parent | Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | Linux 3.0-rc5 (diff) | |
| download | linux-10e6962765f8213941eaa1cbb9de425ff0689e2e.tar.xz linux-10e6962765f8213941eaa1cbb9de425ff0689e2e.zip | |
Merge commit 'v3.0-rc5' into perf/core
Merge reason: Pick up the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/trace/events/irq.h')
| -rw-r--r-- | include/trace/events/irq.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h index ae045ca7d356..1c09820df585 100644 --- a/include/trace/events/irq.h +++ b/include/trace/events/irq.h @@ -20,7 +20,8 @@ struct softirq_action; softirq_name(BLOCK_IOPOLL), \ softirq_name(TASKLET), \ softirq_name(SCHED), \ - softirq_name(HRTIMER)) + softirq_name(HRTIMER), \ + softirq_name(RCU)) /** * irq_handler_entry - called immediately before the irq action handler |