Commit ac4bcf88 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

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: default avatarPeter 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: default avatarIngo Molnar <mingo@elte.hu>
parent 136107a7
......@@ -104,7 +104,7 @@ enum perf_counter_sample_format {
PERF_SAMPLE_ADDR = 1U << 3,
PERF_SAMPLE_GROUP = 1U << 4,
PERF_SAMPLE_CALLCHAIN = 1U << 5,
PERF_SAMPLE_CONFIG = 1U << 6,
PERF_SAMPLE_ID = 1U << 6,
PERF_SAMPLE_CPU = 1U << 7,
};
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment