Merge branch 'perf/urgent' into perf/core, to resolve a conflict

[sfrench/cifs-2.6.git] / tools / perf / util / evsel.h

diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index 62ab307b730661a7bb775284cd0d3ec0d635c874..7906666580da467be3067a66a8632eb0fb897f0b 100644 (file)
--- 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;