---

yaml --- r: 169720 b: refs/heads/master c: f6f8378 h: refs/heads/master v: v3
git-mirror · Nov 21, 2009 · fd0f4e2 · fd0f4e2
1 parent 655bc99
commit fd0f4e2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02ffdbc866c8b1c8644601e9aa6155700eed4c91
+refs/heads/master: f6f83785222b0ee037f7be90731f62a649292b5e
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
@@ -1517,7 +1517,6 @@ static void __perf_event_read(void *info)
 	struct perf_cpu_context *cpuctx = &__get_cpu_var(perf_cpu_context);
 	struct perf_event *event = info;
 	struct perf_event_context *ctx = event->ctx;
-	unsigned long flags;
 
 	/*
 	 * If this is a task context, we need to check whether it is
@@ -1529,12 +1528,10 @@ static void __perf_event_read(void *info)
 	if (ctx->task && cpuctx->task_ctx != ctx)
 		return;
 
-	local_irq_save(flags);
 	if (ctx->is_active)
 		update_context_time(ctx);
 	event->pmu->read(event);
 	update_event_times(event);
-	local_irq_restore(flags);
 }
 
 static u64 perf_event_read(struct perf_event *event)