From 9cfa3fc834d61bccc5ad5bdb718217cd854760a0 Mon Sep 17 00:00:00 2001 From: "eranian@google.com" Date: Wed, 10 Mar 2010 22:26:05 -0800 Subject: [PATCH] --- yaml --- r: 191073 b: refs/heads/master c: 9b33fa6ba0e2f90fdf407501db801c2511121564 h: refs/heads/master i: 191071: 2264c1382821726e0236a05edafd617216fe7fdc v: v3 --- [refs] | 2 +- trunk/kernel/perf_event.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e55d7aceca5b..f24904e9332b 100644 --- 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 index 52c69a34d697..3853d49c7d56 100644 --- 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)