diff options
| author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2009-06-05 14:44:52 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-05 18:07:47 +0200 |
| commit | ac4bcf889469ffbca88f234d3184452886a47905 (patch) | |
| tree | 7a183aaa0524d2e1ad192f01ac9a48ba2e9b51d6 /kernel/perf_counter.c | |
| parent | perf_counter tools: Remove -march=native (diff) | |
| download | linux-ac4bcf889469ffbca88f234d3184452886a47905.tar.xz linux-ac4bcf889469ffbca88f234d3184452886a47905.zip | |
perf_counter: Change PERF_SAMPLE_CONFIG into PERF_SAMPLE_ID
The purpose of PERF_SAMPLE_CONFIG was to identify the counters,
since then we've added counter ids, use those instead.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/perf_counter.c')
| -rw-r--r-- | kernel/perf_counter.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/perf_counter.c b/kernel/perf_counter.c index 37a5a241ca7e..e75b91a76a58 100644 --- a/kernel/perf_counter.c +++ b/kernel/perf_counter.c @@ -2392,8 +2392,8 @@ static void perf_counter_output(struct perf_counter *counter, header.size += sizeof(u64); } - if (sample_type & PERF_SAMPLE_CONFIG) { - header.type |= PERF_SAMPLE_CONFIG; + if (sample_type & PERF_SAMPLE_ID) { + header.type |= PERF_SAMPLE_ID; header.size += sizeof(u64); } @@ -2439,8 +2439,8 @@ static void perf_counter_output(struct perf_counter *counter, if (sample_type & PERF_SAMPLE_ADDR) perf_output_put(&handle, addr); - if (sample_type & PERF_SAMPLE_CONFIG) - perf_output_put(&handle, counter->attr.config); + if (sample_type & PERF_SAMPLE_ID) + perf_output_put(&handle, counter->id); if (sample_type & PERF_SAMPLE_CPU) perf_output_put(&handle, cpu_entry); |