From 9d3eea537439dae72328b52a533b3ae0ab663717 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Fri, 20 Nov 2009 22:19:53 +0100 Subject: [PATCH] --- yaml --- r: 169722 b: refs/heads/master c: 58e5ad1de3d6ad931c84f0cc8ef0655c922f30ad h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/perf_event.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a8853b6031d9..27b4e2bc8818 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3dbebf15c5d3e265f751eec72c1538a00da4be27 +refs/heads/master: 58e5ad1de3d6ad931c84f0cc8ef0655c922f30ad diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c index af150bbcfc5b..028619dd6d0e 100644 --- a/trunk/kernel/perf_event.c +++ b/trunk/kernel/perf_event.c @@ -1526,10 +1526,9 @@ static void __perf_event_read(void *info) if (ctx->task && cpuctx->task_ctx != ctx) return; - if (ctx->is_active) - update_context_time(ctx); - event->pmu->read(event); + update_context_time(ctx); update_event_times(event); + event->pmu->read(event); } static u64 perf_event_read(struct perf_event *event)