From d218290ca2d0d18b193f4ed969eb43eb80865639 Mon Sep 17 00:00:00 2001
From: Nelson Elhage <nelhage@nelhage.com>
Date: Mon, 19 Dec 2011 08:39:30 -0500
Subject: [PATCH] --- yaml --- r: 277338 b: refs/heads/master c:
 301b195db179241da8be25f345f3c4e64960f1d5 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/tools/perf/util/evlist.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a93791caf284..07a67911161c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6581f6e35f7d0338f699fce660adb48e863f2b59
+refs/heads/master: 301b195db179241da8be25f345f3c4e64960f1d5
diff --git a/trunk/tools/perf/util/evlist.c b/trunk/tools/perf/util/evlist.c
index 8b19e7a1e881..963d63dde457 100644
--- a/trunk/tools/perf/util/evlist.c
+++ b/trunk/tools/perf/util/evlist.c
@@ -447,8 +447,10 @@ static int __perf_evlist__mmap(struct perf_evlist *evlist,
 	evlist->mmap[idx].mask = mask;
 	evlist->mmap[idx].base = mmap(NULL, evlist->mmap_len, prot,
 				      MAP_SHARED, fd, 0);
-	if (evlist->mmap[idx].base == MAP_FAILED)
+	if (evlist->mmap[idx].base == MAP_FAILED) {
+		evlist->mmap[idx].base = NULL;
 		return -1;
+	}
 
 	perf_evlist__add_pollfd(evlist, fd);
 	return 0;