From 37f32a196669da8273716403b66ca8debcf04fd4 Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Mon, 17 Aug 2009 23:07:49 +0200
Subject: [PATCH] --- yaml --- r: 158283 b: refs/heads/master c:
 4bf2364a951d3c043e132e4451d90c7bc74dee83 h: refs/heads/master i:   158281:
 2fd13a4cf1c838eab8477547b7bca7047535af98   158279:
 6c3f5c090ab37a641dc226f976654e8ff2d99a7a v: v3

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

diff --git a/[refs] b/[refs]
index 45e77ed0d71f..2cc223ffbc8e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ede59c412579303a25c11f93d4d262e100fc7e6
+refs/heads/master: 4bf2364a951d3c043e132e4451d90c7bc74dee83
diff --git a/trunk/tools/perf/builtin-trace.c b/trunk/tools/perf/builtin-trace.c
index b160a9f61bf3..88eef71bce6d 100644
--- a/trunk/tools/perf/builtin-trace.c
+++ b/trunk/tools/perf/builtin-trace.c
@@ -184,6 +184,10 @@ static int __cmd_trace(void)
 	header = perf_header__read(input);
 	sample_type = perf_header__sample_type(header);
 
+	if (!(sample_type & PERF_SAMPLE_RAW))
+		die("No trace sample to read. Did you call perf record "
+		    "without -R?");
+
 	if (load_kernel() < 0) {
 		perror("failed to load kernel symbols");
 		return EXIT_FAILURE;