summaryrefslogtreecommitdiff
path: root/tools/perf/util/evsel.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-09-16 10:19:56 +0300
committerIngo Molnar <mingo@kernel.org>2015-09-16 10:19:56 +0300
commitd71b0ad8d30922ccdd0705318237e6890b4ec1b6 (patch)
tree347c773357c1afc87d65f767258317164bc0e31e /tools/perf/util/evsel.h
parenta4d71093e759b7cfe0babbc6ae89c8130532f6ad (diff)
parentf6cf87f748ff9480f97ff9c5caf6d6faacf52aa1 (diff)
downloadlinux-d71b0ad8d30922ccdd0705318237e6890b4ec1b6.tar.xz
Merge branch 'perf/urgent' into perf/core, to resolve a conflict
Conflicts: tools/perf/ui/browsers/hists.c Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/evsel.h')
-rw-r--r--tools/perf/util/evsel.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index 62ab307b7306..7906666580da 100644
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -98,6 +98,7 @@ struct perf_evsel {
struct cgroup_sel *cgrp;
void *handler;
struct cpu_map *cpus;
+ struct cpu_map *own_cpus;
struct thread_map *threads;
unsigned int sample_size;
int id_pos;