---

yaml --- r: 191073 b: refs/heads/master c: 9b33fa6 h: refs/heads/master i: 191071: 2264c13 v: v3
git-mirror · Mar 11, 2010 · 9cfa3fc · 9cfa3fc
1 parent 05b4d04
commit 9cfa3fc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: caa0142d84ceb0fc83e28f0475d0a7316cb6df77
+refs/heads/master: 9b33fa6ba0e2f90fdf407501db801c2511121564
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
@@ -1368,6 +1368,8 @@ void perf_event_task_sched_in(struct task_struct *task)
 	if (cpuctx->task_ctx == ctx)
 		return;
 
+	perf_disable();
+
 	/*
 	 * We want to keep the following priority order:
 	 * cpu pinned (that don't need to move), task pinned,
@@ -1380,6 +1382,8 @@ void perf_event_task_sched_in(struct task_struct *task)
 	ctx_sched_in(ctx, cpuctx, EVENT_FLEXIBLE);
 
 	cpuctx->task_ctx = ctx;
+
+	perf_enable();
 }
 
 #define MAX_INTERRUPTS (~0ULL)