summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2009-11-20 22:19:51 +0100
committerIngo Molnar <mingo@elte.hu>2009-11-21 14:11:38 +0100
commitf6f83785222b0ee037f7be90731f62a649292b5e (patch)
treefcafe2c4addc41ac2d65eb29c45ff2cee240efc3 /kernel
parent02ffdbc866c8b1c8644601e9aa6155700eed4c91 (diff)
perf: Optimize __perf_event_read()
Both callers actually have IRQs disabled, no need doing so again. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Paul Mackerras <paulus@samba.org> LKML-Reference: <20091120212508.863685796@chello.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/perf_event.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index 65f4dab0ce60..e66f6c400d13 100644
--- a/kernel/perf_event.c
+++ b/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)