From 1d1ae69d6e3492e0fc5db8439f240275fbe9d9fa Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Fri, 20 Nov 2009 22:19:54 +0100 Subject: [PATCH] --- yaml --- r: 169723 b: refs/heads/master c: 2b8988c9f7defe319cffe0cd362a7cd356c86f62 h: refs/heads/master i: 169721: 327b65d957eb340b916d9a09bee38116be3f2350 169719: 655bc99e66d34eb26a59345d64016bbec2e1553e v: v3 --- [refs] | 2 +- trunk/kernel/perf_event.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 27b4e2bc8818..4de81b6937a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58e5ad1de3d6ad931c84f0cc8ef0655c922f30ad +refs/heads/master: 2b8988c9f7defe319cffe0cd362a7cd356c86f62 diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c index 028619dd6d0e..fdfae888a67c 100644 --- a/trunk/kernel/perf_event.c +++ b/trunk/kernel/perf_event.c @@ -1526,8 +1526,11 @@ static void __perf_event_read(void *info) if (ctx->task && cpuctx->task_ctx != ctx) return; + spin_lock(&ctx->lock); update_context_time(ctx); update_event_times(event); + spin_unlock(&ctx->lock); + event->pmu->read(event); } @@ -1541,7 +1544,13 @@ static u64 perf_event_read(struct perf_event *event) smp_call_function_single(event->oncpu, __perf_event_read, event, 1); } else if (event->state == PERF_EVENT_STATE_INACTIVE) { + struct perf_event_context *ctx = event->ctx; + unsigned long flags; + + spin_lock_irqsave(&ctx->lock, flags); + update_context_time(ctx); update_event_times(event); + spin_unlock_irqrestore(&ctx->lock, flags); } return atomic64_read(&event->count);