From 35bcd6983e0d3ff66140d02b58f92acacb419d83 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 27 May 2009 22:13:17 +0200
Subject: [PATCH] --- yaml --- r: 147555 b: refs/heads/master c:
 55717314c4e3a5180a54228a2f97e50f3496de4c h: refs/heads/master i:   147553:
 b8b1a17dbdc9a25ab7d9fc43f5e968a2df837a9f   147551:
 092c7f325fba0903c2a7b832eefe87d4953a8028 v: v3

---
 [refs]                                          |  2 +-
 .../Documentation/perf_counter/builtin-report.c | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index c1fcd78d4368..3f11e6b93376 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d65537ee7cd4a0818ea80a97ab7932368fff5cd
+refs/heads/master: 55717314c4e3a5180a54228a2f97e50f3496de4c
diff --git a/trunk/Documentation/perf_counter/builtin-report.c b/trunk/Documentation/perf_counter/builtin-report.c
index 6df95c2698c6..5993c129d736 100644
--- a/trunk/Documentation/perf_counter/builtin-report.c
+++ b/trunk/Documentation/perf_counter/builtin-report.c
@@ -1117,9 +1117,9 @@ static int __cmd_report(void)
 		}
 
 		if (thread == NULL) {
-			fprintf(stderr, "problem processing %d event, bailing out\n",
+			fprintf(stderr, "problem processing %d event, skipping it.\n",
 				event->header.type);
-			goto done;
+			goto broken_event;
 		}
 
 		if (event->header.misc & PERF_EVENT_MISC_KERNEL) {
@@ -1149,8 +1149,8 @@ static int __cmd_report(void)
 
 			if (hist_entry__add(thread, map, dso, sym, ip, level)) {
 				fprintf(stderr,
-		"problem incrementing symbol count, bailing out\n");
-				goto done;
+		"problem incrementing symbol count, skipping event\n");
+				goto broken_event;
 			}
 		}
 		total++;
@@ -1169,8 +1169,8 @@ static int __cmd_report(void)
 				event->mmap.filename);
 		}
 		if (thread == NULL || map == NULL) {
-			fprintf(stderr, "problem processing PERF_EVENT_MMAP, bailing out\n");
-			goto done;
+			fprintf(stderr, "problem processing PERF_EVENT_MMAP, skipping event.\n");
+			goto broken_event;
 		}
 		thread__insert_map(thread, map);
 		total_mmap++;
@@ -1187,8 +1187,8 @@ static int __cmd_report(void)
 		}
 		if (thread == NULL ||
 		    thread__set_comm(thread, event->comm.comm)) {
-			fprintf(stderr, "problem processing PERF_EVENT_COMM, bailing out\n");
-			goto done;
+			fprintf(stderr, "problem processing PERF_EVENT_COMM, skipping event.\n");
+			goto broken_event;
 		}
 		total_comm++;
 		break;
@@ -1221,7 +1221,6 @@ static int __cmd_report(void)
 		goto more;
 
 	rc = EXIT_SUCCESS;
-done:
 	close(input);
 
 	if (dump_trace) {