---

yaml --- r: 211826 b: refs/heads/master c: 108b02c h: refs/heads/master v: v3
git-mirror · Sep 9, 2010 · 50b2616 · 50b2616
1 parent 6a6b2cb
commit 50b2616
Show file tree

Hide file tree

Showing 3 changed files with 114 additions and 70 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5ab4cd563e7ab49b27957704112a8ecade54e1f
+refs/heads/master: 108b02cfce04ee90b0a07ee0b104baffd39f5934
diff --git a/trunk/include/linux/perf_event.h b/trunk/include/linux/perf_event.h
@@ -570,7 +570,8 @@ struct perf_event;
 struct pmu {
 	struct list_head		entry;
 
-	int				*pmu_disable_count;
+	int * __percpu			pmu_disable_count;
+	struct perf_cpu_context * __percpu pmu_cpu_context;
 
 	/*
 	 * Fully disable/enable this PMU, can be used to protect from the PMI
@@ -808,6 +809,7 @@ struct perf_event {
  * Used as a container for task events and CPU events as well:
  */
 struct perf_event_context {
+	struct pmu			*pmu;
 	/*
 	 * Protect the states of the events in the list,
 	 * nr_active, and the list: