Merge branch 'perf/urgent' into perf/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2015-01-28 15:42:56 +01:00
parent 86038c5ea8 e742f3dc08
commit f10698ed68
500 changed files with 4676 additions and 3203 deletions
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -450,11 +450,6 @@ struct perf_event {
 #endif /* CONFIG_PERF_EVENTS */
 };

-enum perf_event_context_type {
-	task_context,
-	cpu_context,
-};
-
 /**
 * struct perf_event_context - event context structure
 *
@@ -462,7 +457,6 @@ enum perf_event_context_type {
 */
 struct perf_event_context {
 	struct pmu			*pmu;
-	enum perf_event_context_type	type;
 	/*
 	 * Protect the states of the events in the list,
 	 * nr_active, and the list: