---

yaml --- r: 169723 b: refs/heads/master c: 2b8988c h: refs/heads/master i: 169721: 327b65d 169719: 655bc99 v: v3
git-mirror · Nov 21, 2009 · 1d1ae69 · 1d1ae69
1 parent 9d3eea5
commit 1d1ae69
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git 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
@@ -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);