From ac7e5f744576a5dce25adea40dc7c29528ffd208 Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Wed, 14 Apr 2010 20:05:17 +0200
Subject: [PATCH] --- yaml --- r: 191199 b: refs/heads/master c:
 bdef3b02ceeb97f5f67fcfa6dff13c4e70b34fb7 h: refs/heads/master i:   191197:
 5489f714ab2939939f075dbed2e6b2cc43ebbbd4   191195:
 cff2a79b6929b900b24a8170ea162aa912a0b83a   191191:
 953dc651c69052af8f7ebf8f0f5a7f826d2e5f08   191183:
 ffbbdc6835f49cfcd92396193ed8cda845e845b9   191167:
 14eb9abe70b32690c7dcc3438fa6eb87b4b3b60a v: v3

---
 [refs]                                         |  2 +-
 trunk/tools/perf/Documentation/perf-record.txt |  2 +-
 trunk/tools/perf/util/parse-events.c           | 14 ++++----------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 192e2d9812fa..d0a98b5d7785 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7865e817e9b4b378ac57ab7f16183100b95466ce
+refs/heads/master: bdef3b02ceeb97f5f67fcfa6dff13c4e70b34fb7
diff --git a/trunk/tools/perf/Documentation/perf-record.txt b/trunk/tools/perf/Documentation/perf-record.txt
index b29bd2db6a49..020d871c7934 100644
--- a/trunk/tools/perf/Documentation/perf-record.txt
+++ b/trunk/tools/perf/Documentation/perf-record.txt
@@ -101,7 +101,7 @@ OPTIONS
 
 -R::
 --raw-samples::
-Collect raw sample records from all opened counters (typically for tracepoint counters).
+Collect raw sample records from all opened counters (default for tracepoint counters).
 
 SEE ALSO
 --------
diff --git a/trunk/tools/perf/util/parse-events.c b/trunk/tools/perf/util/parse-events.c
index 435781e0c205..880070c02fd2 100644
--- a/trunk/tools/perf/util/parse-events.c
+++ b/trunk/tools/perf/util/parse-events.c
@@ -410,7 +410,6 @@ static enum event_result
 parse_single_tracepoint_event(char *sys_name,
 			      const char *evt_name,
 			      unsigned int evt_length,
-			      char *flags,
 			      struct perf_event_attr *attr,
 			      const char **strp)
 {
@@ -419,13 +418,9 @@ parse_single_tracepoint_event(char *sys_name,
 	u64 id;
 	int fd;
 
-	if (flags) {
-		if (!strncmp(flags, "record", strlen(flags))) {
-			attr->sample_type |= PERF_SAMPLE_RAW;
-			attr->sample_type |= PERF_SAMPLE_TIME;
-			attr->sample_type |= PERF_SAMPLE_CPU;
-		}
-	}
+	attr->sample_type |= PERF_SAMPLE_RAW;
+	attr->sample_type |= PERF_SAMPLE_TIME;
+	attr->sample_type |= PERF_SAMPLE_CPU;
 
 	snprintf(evt_path, MAXPATHLEN, "%s/%s/%s/id", debugfs_path,
 		 sys_name, evt_name);
@@ -533,8 +528,7 @@ static enum event_result parse_tracepoint_event(const char **strp,
 						       flags);
 	} else
 		return parse_single_tracepoint_event(sys_name, evt_name,
-						     evt_length, flags,
-						     attr, strp);
+						     evt_length, attr, strp);
 }
 
 static enum event_result