diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-12-20 20:32:37 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-12-20 20:32:37 +0100 |
| commit | d9e24427f339e5c18419769d41697062811c5cd8 (patch) | |
| tree | 3c50f19561f60d4175d375ff8d39ec203a42eb8c /tools/perf/util/evlist.c | |
| parent | d87f69a16eb2cb96459117b06949a560679002e4 (diff) | |
| parent | 65c1e0452a3389f9b7b8c1b23305ed2922fafb2d (diff) | |
| download | op-kernel-dev-d9e24427f339e5c18419769d41697062811c5cd8.zip op-kernel-dev-d9e24427f339e5c18419769d41697062811c5cd8.tar.gz | |
Merge branch 'perf/core' of git://github.com/acmel/linux into perf/core
Diffstat (limited to 'tools/perf/util/evlist.c')
| -rw-r--r-- | tools/perf/util/evlist.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index 8b19e7a..963d63d 100644 --- a/tools/perf/util/evlist.c +++ b/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; |
