From 8d086a4463879fc7800408c0cabcffc9b0ec4aa8 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Fri, 5 Jun 2009 14:44:52 +0200 Subject: [PATCH] --- yaml --- r: 147673 b: refs/heads/master c: ac4bcf889469ffbca88f234d3184452886a47905 h: refs/heads/master i: 147671: e960f00002641ed73473e1bed597a51c58ae7918 v: v3 --- [refs] | 2 +- trunk/include/linux/perf_counter.h | 2 +- trunk/kernel/perf_counter.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 2c74fcb55565..d31a57d0ce5a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 136107a76fe5f62906162f730834477b71cf131e +refs/heads/master: ac4bcf889469ffbca88f234d3184452886a47905 diff --git a/trunk/include/linux/perf_counter.h b/trunk/include/linux/perf_counter.h index 40dc0e273d9c..9cea32a0655d 100644 --- a/trunk/include/linux/perf_counter.h +++ b/trunk/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/trunk/kernel/perf_counter.c b/trunk/kernel/perf_counter.c index 37a5a241ca7e..e75b91a76a58 100644 --- a/trunk/kernel/perf_counter.c +++ b/trunk/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);