aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2010-09-17 05:28:48 -0400
committerIngo Molnar <mingo@elte.hu>2010-09-17 06:48:48 -0400
commitb04243ef7006cda301819f54ee7ce0a3632489e3 (patch)
treee8e83c53d40dce08ad5bfc37ec1e58b3a5aa7adc /include/linux
parentd14b12d7adbf214f33eb59f800b5c3d5ed9268e8 (diff)
perf: Complete software pmu grouping
Aside from allowing software events into a !software group, allow adding !software events to pure software groups. Once we've moved the software group and attached the first !software event, the group will no longer be a pure software group and hence no longer be eligible for movement, at which point the straight ctx comparison is correct again. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Stephane Eranian <eranian@google.com> Cc: Robert Richter <robert.richter@amd.com> Cc: Paul Mackerras <paulus@samba.org> LKML-Reference: <20100917093009.410784731@chello.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/perf_event.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 39d8860b2684..165287fd2cc4 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -804,12 +804,18 @@ struct perf_event {
804#endif /* CONFIG_PERF_EVENTS */ 804#endif /* CONFIG_PERF_EVENTS */
805}; 805};
806 806
807enum perf_event_context_type {
808 task_context,
809 cpu_context,
810};
811
807/** 812/**
808 * struct perf_event_context - event context structure 813 * struct perf_event_context - event context structure
809 * 814 *
810 * Used as a container for task events and CPU events as well: 815 * Used as a container for task events and CPU events as well:
811 */ 816 */
812struct perf_event_context { 817struct perf_event_context {
818 enum perf_event_context_type type;
813 struct pmu *pmu; 819 struct pmu *pmu;
814 /* 820 /*
815 * Protect the states of the events in the list, 821 * Protect the states of the events in the list,