diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-08 08:36:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-08 08:36:15 -0700 |
| commit | 33726bf2140a0e7c9de3ccd7cba6d69962f0b773 (patch) | |
| tree | a4f5bca74d61072533806a2fe7f257357cae1ce2 /tools/perf/util/evlist.h | |
| parent | 5b28f6a25ee202046e2d57bd431671bc23cf3dd1 (diff) | |
| parent | d7ebe75b065a7c2d58ffc12f9d2e00d5ea4e71eb (diff) | |
| download | op-kernel-dev-33726bf2140a0e7c9de3ccd7cba6d69962f0b773.zip op-kernel-dev-33726bf2140a0e7c9de3ccd7cba6d69962f0b773.tar.gz | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf: Fix comments in include/linux/perf_event.h
perf: Comment /proc/sys/kernel/perf_event_paranoid to be part of user ABI
perf python: Fix argument name list of read_on_cpu()
perf evlist: Don't die if sample_{id_all|type} is invalid
perf python: Use exception to propagate errors
perf evlist: Remove dependency on debug routines
perf, cgroups: Fix up for new API
Diffstat (limited to 'tools/perf/util/evlist.h')
| -rw-r--r-- | tools/perf/util/evlist.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h index 0a1ef1f..b2b8623 100644 --- a/tools/perf/util/evlist.h +++ b/tools/perf/util/evlist.h @@ -66,7 +66,9 @@ int perf_evlist__create_maps(struct perf_evlist *evlist, pid_t target_pid, void perf_evlist__delete_maps(struct perf_evlist *evlist); int perf_evlist__set_filters(struct perf_evlist *evlist); -u64 perf_evlist__sample_type(struct perf_evlist *evlist); -bool perf_evlist__sample_id_all(const struct perf_evlist *evlist); +u64 perf_evlist__sample_type(const struct perf_evlist *evlist); +bool perf_evlist__sample_id_all(const const struct perf_evlist *evlist); +bool perf_evlist__valid_sample_type(const struct perf_evlist *evlist); +bool perf_evlist__valid_sample_id_all(const struct perf_evlist *evlist); #endif /* __PERF_EVLIST_H */ |
