aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2009-11-20 16:19:55 -0500
committerIngo Molnar <mingo@elte.hu>2009-11-21 08:11:40 -0500
commit59ed446f792cc07d37b1536b9c4664d14e25e425 (patch)
tree707c009e252b082ffac5c5209f4bdc013b1b5c62 /include
parent2b8988c9f7defe319cffe0cd362a7cd356c86f62 (diff)
perf: Fix event scaling for inherited counters
Properly account the full hierarchy of counters for both the count (we already did so) and the scale times (new). Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Paul Mackerras <paulus@samba.org> LKML-Reference: <20091120212509.153379276@chello.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
-rw-r--r--include/linux/perf_event.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index a430ac3074af..36fe89f72641 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -782,7 +782,8 @@ perf_event_create_kernel_counter(struct perf_event_attr *attr,
782 int cpu, 782 int cpu,
783 pid_t pid, 783 pid_t pid,
784 perf_callback_t callback); 784 perf_callback_t callback);
785extern u64 perf_event_read_value(struct perf_event *event); 785extern u64 perf_event_read_value(struct perf_event *event,
786 u64 *enabled, u64 *running);
786 787
787struct perf_sample_data { 788struct perf_sample_data {
788 u64 type; 789 u64 type;