diff options
| author | Ingo Molnar | 2015-09-16 09:19:56 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2015-09-16 09:19:56 +0200 |
| commit | d71b0ad8d30922ccdd0705318237e6890b4ec1b6 (patch) | |
| tree | 347c773357c1afc87d65f767258317164bc0e31e /tools/perf/util/evsel.h | |
| parent | Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| download | kernel-qcow2-linux-d71b0ad8d30922ccdd0705318237e6890b4ec1b6.tar.gz kernel-qcow2-linux-d71b0ad8d30922ccdd0705318237e6890b4ec1b6.tar.xz kernel-qcow2-linux-d71b0ad8d30922ccdd0705318237e6890b4ec1b6.zip | |
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.h | 1 |
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; |