From 228a00796bffcfd1d2fcb3d240a3dc7c1de3169e Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Mon, 10 Dec 2012 16:04:40 -0300
Subject: [PATCH] --- yaml --- r: 349904 b: refs/heads/master c:
 62b807f64948f55776b1cc57298966d915b1a402 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index cb2795d7d748..7327a387d0bf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a5afaec593954a399967155db47f72cb8828a6a
+refs/heads/master: 62b807f64948f55776b1cc57298966d915b1a402
diff --git a/trunk/tools/perf/tests/attr/base-record b/trunk/tools/perf/tests/attr/base-record
index f9d04643109e..5bc3880f7be5 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=3
+read_format=0
 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 0df34cab3e42..57739cacdb2a 100644
--- a/trunk/tools/perf/tests/attr/test-record-group
+++ b/trunk/tools/perf/tests/attr/test-record-group
@@ -6,14 +6,14 @@ args    = --group -e cycles,instructions kill >/dev/null 2>&1
 fd=1
 group_fd=-1
 sample_type=327
-read_format=7
+read_format=4
 
 [event-2:base-record]
 fd=2
 group_fd=1
 config=1
 sample_type=327
-read_format=7
+read_format=4
 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 18bd926ff6cb..4d688a13fd2f 100644
--- a/trunk/tools/perf/tests/attr/test-record-group1
+++ b/trunk/tools/perf/tests/attr/test-record-group1
@@ -6,7 +6,7 @@ args    = -e '{cycles,instructions}' kill >/tmp/krava 2>&1
 fd=1
 group_fd=-1
 sample_type=327
-read_format=7
+read_format=4
 
 [event-2:base-record]
 fd=2
@@ -14,7 +14,7 @@ group_fd=1
 type=0
 config=1
 sample_type=327
-read_format=7
+read_format=4
 mmap=0
 comm=0
 enable_on_exec=0
diff --git a/trunk/tools/perf/util/evsel.c b/trunk/tools/perf/util/evsel.c
index e62d3aef9cd6..2492d329a5f5 100644
--- a/trunk/tools/perf/util/evsel.c
+++ b/trunk/tools/perf/util/evsel.c
@@ -465,8 +465,6 @@ 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_evsel__set_sample_bit(evsel, IP);
 	perf_evsel__set_sample_bit(evsel, TID);