---

yaml --- r: 211829 b: refs/heads/master c: 8dc85d5 h: refs/heads/master i: 211827: fe3bc82 v: v3
git-mirror · Sep 9, 2010 · e2a5f21 · e2a5f21
1 parent 25a82ba
commit e2a5f21
Show file tree

Hide file tree

Showing 4 changed files with 240 additions and 107 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb184479874238393ac186c4e054d24311c34aaa
+refs/heads/master: 8dc85d547285668e509f86c177bcd4ea055bcaaf
diff --git a/trunk/include/linux/perf_event.h b/trunk/include/linux/perf_event.h
@@ -572,6 +572,7 @@ struct pmu {
 
 	int * __percpu			pmu_disable_count;
 	struct perf_cpu_context * __percpu pmu_cpu_context;
+	int				task_ctx_nr;
 
 	/*
 	 * Fully disable/enable this PMU, can be used to protect from the PMI

diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h
@@ -1160,6 +1160,12 @@ struct sched_rt_entity {
 
 struct rcu_node;
 
+enum perf_event_task_context {
+	perf_invalid_context = -1,
+	perf_hw_context = 0,
+	perf_nr_task_contexts,
+};
+
 struct task_struct {
 	volatile long state;	/* -1 unrunnable, 0 runnable, >0 stopped */
 	void *stack;
@@ -1431,7 +1437,7 @@ struct task_struct {
 	struct futex_pi_state *pi_state_cache;
 #endif
 #ifdef CONFIG_PERF_EVENTS
-	struct perf_event_context *perf_event_ctxp;
+	struct perf_event_context *perf_event_ctxp[perf_nr_task_contexts];
 	struct mutex perf_event_mutex;
 	struct list_head perf_event_list;
 #endif