diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2011-05-22 10:07:37 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-22 10:10:01 +0200 |
| commit | 3ac1bbcf13c56a19927df670f429eb0c3c11f8e5 (patch) | |
| tree | 693e2b7f1a9cb0c6ed6d44375e370e1ae08c7ac9 /tools/perf/util/evlist.h | |
| parent | extable, core_kernel_data(): Make sure all archs define _sdata (diff) | |
| parent | perf tools: Propagate event parse error handling (diff) | |
| download | linux-dev-3ac1bbcf13c56a19927df670f429eb0c3c11f8e5.tar.xz linux-dev-3ac1bbcf13c56a19927df670f429eb0c3c11f8e5.zip | |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/urgent
Conflicts:
tools/perf/builtin-top.c
Semantic conflict:
util/include/linux/list.h # fix prefetch.h removal fallout
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/util/evlist.h')
| -rw-r--r-- | tools/perf/util/evlist.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h index 7109d7add14e..0a1ef1f051f0 100644 --- a/tools/perf/util/evlist.h +++ b/tools/perf/util/evlist.h @@ -66,4 +66,7 @@ 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); + #endif /* __PERF_EVLIST_H */ |