summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2009-06-22 14:34:35 +0200
committerIngo Molnar <mingo@elte.hu>2009-06-25 21:39:05 +0200
commit7f8b4e4e0988dadfd22330fd147ad2453e19f510 (patch)
treeb57c6b0fbfd3718dbc6f27bd7f422bb276c11469 /kernel
parentperf_counter: Split the mmap control page in two parts (diff)
downloadlinux-7f8b4e4e0988dadfd22330fd147ad2453e19f510.tar.xz
linux-7f8b4e4e0988dadfd22330fd147ad2453e19f510.zip
perf_counter: Add scale information to the mmap control page
Add the needed time scale to the self-profile mmap information. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> LKML-Reference: <new-submission> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/perf_counter.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/perf_counter.c b/kernel/perf_counter.c
index c2b19c111718..23614adab475 100644
--- a/kernel/perf_counter.c
+++ b/kernel/perf_counter.c
@@ -1782,6 +1782,12 @@ void perf_counter_update_userpage(struct perf_counter *counter)
if (counter->state == PERF_COUNTER_STATE_ACTIVE)
userpg->offset -= atomic64_read(&counter->hw.prev_count);
+ userpg->time_enabled = counter->total_time_enabled +
+ atomic64_read(&counter->child_total_time_enabled);
+
+ userpg->time_running = counter->total_time_running +
+ atomic64_read(&counter->child_total_time_running);
+
barrier();
++userpg->lock;
preempt_enable();