From ff0fd5dcee11edd330c4a80d66b12f0024acc902 Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Mon, 10 Dec 2012 15:29:12 -0300
Subject: [PATCH] --- yaml --- r: 349903 b: refs/heads/master c:
 3a5afaec593954a399967155db47f72cb8828a6a h: refs/heads/master i:   349901:
 af8f34e978546a9b18a387bb5510ed87b2c21723   349899:
 149a3ea8429e955718f63d711339caf3e6ef4ecf   349895:
 c06085172d8d224b82c46579ae119f8d472ce9f8   349887:
 a564cca6c75c702b0868b85f4cb72264bd515239 v: v3

---
 [refs]                                         | 2 +-
 trunk/tools/perf/tests/attr/base-record        | 2 +-
 trunk/tools/perf/tests/attr/test-record-group  | 2 ++
 trunk/tools/perf/tests/attr/test-record-group1 | 2 ++
 trunk/tools/perf/util/evlist.c                 | 2 +-
 trunk/tools/perf/util/evsel.c                  | 3 +--
 6 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 6c68d7ffdcaa..cb2795d7d748 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a5a5ca5fe3df8636c96b49591c23baf7c415dd4
+refs/heads/master: 3a5afaec593954a399967155db47f72cb8828a6a
diff --git a/trunk/tools/perf/tests/attr/base-record b/trunk/tools/perf/tests/attr/base-record
index f1485d8e6a0b..f9d04643109e 100644
--- a/trunk/tools/perf/tests/attr/base-record
+++ b/trunk/tools/perf/tests/attr/base-record
@@ -7,7 +7,7 @@ size=96
 config=0
 sample_period=4000
 sample_type=263
-read_format=7
+read_format=3
 disabled=1
 inherit=1
 pinned=0
diff --git a/trunk/tools/perf/tests/attr/test-record-group b/trunk/tools/perf/tests/attr/test-record-group
index a6599e9a19d3..0df34cab3e42 100644
--- a/trunk/tools/perf/tests/attr/test-record-group
+++ b/trunk/tools/perf/tests/attr/test-record-group
@@ -6,12 +6,14 @@ args    = --group -e cycles,instructions kill >/dev/null 2>&1
 fd=1
 group_fd=-1
 sample_type=327
+read_format=7
 
 [event-2:base-record]
 fd=2
 group_fd=1
 config=1
 sample_type=327
+read_format=7
 mmap=0
 comm=0
 enable_on_exec=0
diff --git a/trunk/tools/perf/tests/attr/test-record-group1 b/trunk/tools/perf/tests/attr/test-record-group1
index 5a8359da38af..18bd926ff6cb 100644
--- a/trunk/tools/perf/tests/attr/test-record-group1
+++ b/trunk/tools/perf/tests/attr/test-record-group1
@@ -6,6 +6,7 @@ args    = -e '{cycles,instructions}' kill >/tmp/krava 2>&1
 fd=1
 group_fd=-1
 sample_type=327
+read_format=7
 
 [event-2:base-record]
 fd=2
@@ -13,6 +14,7 @@ group_fd=1
 type=0
 config=1
 sample_type=327
+read_format=7
 mmap=0
 comm=0
 enable_on_exec=0
diff --git a/trunk/tools/perf/util/evlist.c b/trunk/tools/perf/util/evlist.c
index 265565942ae5..5a0878d3a038 100644
--- a/trunk/tools/perf/util/evlist.c
+++ b/trunk/tools/perf/util/evlist.c
@@ -61,7 +61,7 @@ void perf_evlist__config_attrs(struct perf_evlist *evlist,
 		perf_evsel__config(evsel, opts);
 
 		if (evlist->nr_entries > 1)
-			perf_evsel__set_sample_bit(evsel, ID);
+			perf_evsel__set_sample_id(evsel);
 	}
 }
 
diff --git a/trunk/tools/perf/util/evsel.c b/trunk/tools/perf/util/evsel.c
index 9dde7e933be9..e62d3aef9cd6 100644
--- a/trunk/tools/perf/util/evsel.c
+++ b/trunk/tools/perf/util/evsel.c
@@ -466,8 +466,7 @@ void perf_evsel__config(struct perf_evsel *evsel,
 	attr->sample_id_all = opts->sample_id_all_missing ? 0 : 1;
 	attr->inherit	    = !opts->no_inherit;
 	attr->read_format   = PERF_FORMAT_TOTAL_TIME_ENABLED |
-			      PERF_FORMAT_TOTAL_TIME_RUNNING |
-			      PERF_FORMAT_ID;
+			      PERF_FORMAT_TOTAL_TIME_RUNNING;
 
 	perf_evsel__set_sample_bit(evsel, IP);
 	perf_evsel__set_sample_bit(evsel, TID);