summaryrefslogtreecommitdiff
path: root/tools/perf
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-19 19:56:56 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-19 19:56:56 +0400
commit357ed6b1a110048ff8106f99092d6c4a7aadb45a (patch)
treeff4eb7e809e547bc3c0680dfd51793a8f57b2063 /tools/perf
parentde505e709ffb09a7382ca8e0d8c7dbb171ba5830 (diff)
parentf8b7fc6b514f34a51875dd48dff70d4d17a54f38 (diff)
downloadlinux-357ed6b1a110048ff8106f99092d6c4a7aadb45a.tar.xz
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: rcu: Move RCU_BOOST #ifdefs to header file rcu: use softirq instead of kthreads except when RCU_BOOST=y rcu: Use softirq to address performance regression rcu: Simplify curing of load woes
Diffstat (limited to 'tools/perf')
-rw-r--r--tools/perf/util/trace-event-parse.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
index 1e88485c16a0..0a7ed5b5e281 100644
--- a/tools/perf/util/trace-event-parse.c
+++ b/tools/perf/util/trace-event-parse.c
@@ -2187,6 +2187,7 @@ static const struct flag flags[] = {
{ "TASKLET_SOFTIRQ", 6 },
{ "SCHED_SOFTIRQ", 7 },
{ "HRTIMER_SOFTIRQ", 8 },
+ { "RCU_SOFTIRQ", 9 },
{ "HRTIMER_NORESTART", 0 },
{ "HRTIMER_RESTART", 1 },