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>

diff --git a/include/linux/perf_counter.h b/include/linux/perf_counter.h
index 40dc0e273d9c4559aa975c665fc4f856808de3f0..9cea32a0655d845c20e33efd979f9ef14a8cf9b9 100644 (file)
--- a/include/linux/perf_counter.h
+++ b/include/linux/perf_counter.h
@@ -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,
 };
 

diff --git a/kernel/perf_counter.c b/kernel/perf_counter.c
index 37a5a241ca7eca0c1dc2ce07589271e839594f05..e75b91a76a58f16f278a0acc58ddedb7379304a4 100644 (file)
--- 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);