From 6e833642c36273cca1456ea869346efac5fd1d96 Mon Sep 17 00:00:00 2001
From: Jiri Olsa <jolsa@redhat.com>
Date: Mon, 10 Sep 2012 18:50:16 +0200
Subject: [PATCH] --- yaml --- r: 323805 b: refs/heads/master c:
 bdde37163e1fd474509aab90f5eaacee46100107 h: refs/heads/master i:   323803:
 994dfb3bc62ebb618832ddfc3e875f573100e647 v: v3

---
 [refs]                          | 2 +-
 trunk/tools/perf/util/session.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1f018b497a14..ff54a24393c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ac3e487f0eeef0fa058d72da7681398cc052ee9
+refs/heads/master: bdde37163e1fd474509aab90f5eaacee46100107
diff --git a/trunk/tools/perf/util/session.c b/trunk/tools/perf/util/session.c
index 3806ea49f1f7..0ecd62be2091 100644
--- a/trunk/tools/perf/util/session.c
+++ b/trunk/tools/perf/util/session.c
@@ -388,6 +388,11 @@ int machine__resolve_callchain(struct machine *machine,
 	      (evsel->attr.sample_type & PERF_SAMPLE_STACK_USER)))
 		return 0;
 
+	/* Bail out if nothing was captured. */
+	if ((!sample->user_regs.regs) ||
+	    (!sample->user_stack.size))
+		return 0;
+
 	return unwind__get_entries(unwind_entry, &callchain_cursor, machine,
 				   thread, evsel->attr.sample_regs_user,
 				   sample);