aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-01-21 08:50:04 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-01-21 08:50:04 -0800
commite80b1359858df17b0034bdf7d1b6f3e0d5b97257 (patch)
treec0ce7b9abcef8910ee78327285d85b04b0512d33 /include
parent341031caec0cd730e84d248d95851bf54ec4e41f (diff)
parentb27d515a49169e5e2a92d621faac761074a8c5b1 (diff)
downloadmrst-s0i3-test-e80b1359858df17b0034bdf7d1b6f3e0d5b97257.tar.gz
mrst-s0i3-test-e80b1359858df17b0034bdf7d1b6f3e0d5b97257.tar.xz
mrst-s0i3-test-e80b1359858df17b0034bdf7d1b6f3e0d5b97257.zip
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf: x86: Add support for the ANY bit perf: Change the is_software_event() definition perf: Honour event state for aux stream data perf: Fix perf_event_do_pending() fallback callsite perf kmem: Print usage help for unknown commands perf kmem: Increase "Hit" column length hw-breakpoints, perf: Fix broken mmiotrace due to dr6 by reference change perf timechart: Use tid not pid for COMM change
Diffstat (limited to 'include')
-rw-r--r--include/linux/perf_event.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index c66b34f75ee..8fa71874113 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -814,9 +814,14 @@ extern int perf_event_overflow(struct perf_event *event, int nmi,
*/
static inline int is_software_event(struct perf_event *event)
{
- return (event->attr.type != PERF_TYPE_RAW) &&
- (event->attr.type != PERF_TYPE_HARDWARE) &&
- (event->attr.type != PERF_TYPE_HW_CACHE);
+ switch (event->attr.type) {
+ case PERF_TYPE_SOFTWARE:
+ case PERF_TYPE_TRACEPOINT:
+ /* for now the breakpoint stuff also works as software event */
+ case PERF_TYPE_BREAKPOINT:
+ return 1;
+ }
+ return 0;
}
extern atomic_t perf_swevent_enabled[PERF_COUNT_SW_MAX];