From e8d01354295d9ac95030f2ec4ef6dee0c53aee1b Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Thu, 24 Jan 2013 22:34:33 -0300
Subject: [PATCH] --- yaml --- r: 349993 b: refs/heads/master c:
 2caa48a24061b1f8e8dab43ea3292a608a15e3c9 h: refs/heads/master i:   349991:
 687b85c600e0297e99a5129414c5b9a53ef7a2b2 v: v3

---
 [refs]                         |  2 +-
 trunk/tools/perf/util/header.c | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 6a27d9e1defe..be2179ba21e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d9233f205e8855dc762665e28012354cd46af45
+refs/heads/master: 2caa48a24061b1f8e8dab43ea3292a608a15e3c9
diff --git a/trunk/tools/perf/util/header.c b/trunk/tools/perf/util/header.c
index fccd69dbbbb9..e17a8fe9c4d7 100644
--- a/trunk/tools/perf/util/header.c
+++ b/trunk/tools/perf/util/header.c
@@ -2921,16 +2921,22 @@ int perf_event__process_tracing_data(union perf_event *event,
 				 session->repipe);
 	padding = PERF_ALIGN(size_read, sizeof(u64)) - size_read;
 
-	if (readn(session->fd, buf, padding) < 0)
-		die("reading input file");
+	if (readn(session->fd, buf, padding) < 0) {
+		pr_err("%s: reading input file", __func__);
+		return -1;
+	}
 	if (session->repipe) {
 		int retw = write(STDOUT_FILENO, buf, padding);
-		if (retw <= 0 || retw != padding)
-			die("repiping tracing data padding");
+		if (retw <= 0 || retw != padding) {
+			pr_err("%s: repiping tracing data padding", __func__);
+			return -1;
+		}
 	}
 
-	if (size_read + padding != size)
-		die("tracing data size mismatch");
+	if (size_read + padding != size) {
+		pr_err("%s: tracing data size mismatch", __func__);
+		return -1;
+	}
 
 	perf_evlist__prepare_tracepoint_events(session->evlist,
 					       session->pevent);