From 2f0d99667c0317cc7c9bbbe0f985f0625860f8b1 Mon Sep 17 00:00:00 2001
From: Eric B Munson <ebmunson@us.ibm.com>
Date: Fri, 5 Mar 2010 12:51:05 -0300
Subject: [PATCH] --- yaml --- r: 188261 b: refs/heads/master c:
 8907fd607b66e36636469a2de9833db643869db8 h: refs/heads/master i:   188259:
 6b5c01b8fb8ec2bbd3db40d6274ecb33c639a011 v: v3

---
 [refs]                            | 2 +-
 trunk/tools/perf/builtin-record.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 310b34f350dc..58c44d113814 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: accd3cc45a0e1d11090ea66888405987de77bdca
+refs/heads/master: 8907fd607b66e36636469a2de9833db643869db8
diff --git a/trunk/tools/perf/builtin-record.c b/trunk/tools/perf/builtin-record.c
index 771533ced6a8..f573bbb83572 100644
--- a/trunk/tools/perf/builtin-record.c
+++ b/trunk/tools/perf/builtin-record.c
@@ -244,6 +244,9 @@ static void create_counter(int counter, int cpu, pid_t pid)
 
 	attr->sample_type	|= PERF_SAMPLE_IP | PERF_SAMPLE_TID;
 
+	if (nr_counters > 1)
+		attr->sample_type |= PERF_SAMPLE_ID;
+
 	if (freq) {
 		attr->sample_type	|= PERF_SAMPLE_PERIOD;
 		attr->freq		= 1;