summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2010-12-07 14:18:20 +0100
committerIngo Molnar <mingo@elte.hu>2010-12-08 20:14:08 +0100
commit5167695753c63444a9e6cbbef136200a16c7a225 (patch)
tree6394b1e620027882556beb2e899449805dd3c3cc /include
parentMerge branches 'x86-fixes-for-linus', 'perf-fixes-for-linus' and 'sched-fixes... (diff)
downloadlinux-5167695753c63444a9e6cbbef136200a16c7a225.tar.xz
linux-5167695753c63444a9e6cbbef136200a16c7a225.zip
perf: Fix duplicate events with multiple-pmu vs software events
Because the multi-pmu bits can share contexts between struct pmu instances we could get duplicate events by iterating the pmu list. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> LKML-Reference: <new-submission> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
-rw-r--r--include/linux/perf_event.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index de2c41758e29..4f1279e105ee 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -887,6 +887,7 @@ struct perf_cpu_context {
int exclusive;
struct list_head rotation_list;
int jiffies_interval;
+ struct pmu *active_pmu;
};
struct perf_output_handle {