From fd0f4e29c10ee49a9d2fb691d55d8b2b89dd36d5 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Fri, 20 Nov 2009 22:19:51 +0100 Subject: [PATCH] --- yaml --- r: 169720 b: refs/heads/master c: f6f83785222b0ee037f7be90731f62a649292b5e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/perf_event.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e02374eb1bb4..7b217e67d6cb 100644 --- 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 index 65f4dab0ce60..e66f6c400d13 100644 --- 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)