Merge branch 'for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata

[firefly-linux-kernel-4.4.55.git] / tools / perf / util / evlist.h

diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
index a8930b68456b07e1ee05317deb375e1788b29e53..b39a6198f4ac00ae4c30cdfe659667cc84db7780 100644 (file)
--- a/tools/perf/util/evlist.h
+++ b/tools/perf/util/evlist.h
@@ -56,6 +56,7 @@ struct perf_evlist {
        struct cpu_map    *cpus;
        struct perf_evsel *selected;
        struct events_stats stats;
+       struct perf_env *env;
 };
 
 struct perf_evsel_str_handler {
@@ -115,6 +116,7 @@ void perf_evlist__close(struct perf_evlist *evlist);
 void perf_evlist__set_id_pos(struct perf_evlist *evlist);
 bool perf_can_sample_identifier(void);
 bool perf_can_record_switch_events(void);
+bool perf_can_record_cpu_wide(void);
 void perf_evlist__config(struct perf_evlist *evlist, struct record_opts *opts);
 int record_opts__config(struct record_opts *opts);
 
@@ -165,6 +167,7 @@ void perf_evlist__set_leader(struct perf_evlist *evlist);
 u64 perf_evlist__read_format(struct perf_evlist *evlist);
 u64 __perf_evlist__combined_sample_type(struct perf_evlist *evlist);
 u64 perf_evlist__combined_sample_type(struct perf_evlist *evlist);
+u64 perf_evlist__combined_branch_type(struct perf_evlist *evlist);
 bool perf_evlist__sample_id_all(struct perf_evlist *evlist);
 u16 perf_evlist__id_hdr_size(struct perf_evlist *evlist);