From a08f2dde3071f95c4ab85ae1787efe0049f2c00d Mon Sep 17 00:00:00 2001 From: Nelson Elhage Date: Mon, 19 Dec 2011 08:39:31 -0500 Subject: [PATCH] --- yaml --- r: 277355 b: refs/heads/master c: 18e6093904abfd51671ff5846c2fdaba9ebbf21b h: refs/heads/master i: 277353: 0a1762bfd14f2324ef47402301315761d089949e 277351: fc9dc047339b2acd91ad41b0c6b0a1c9c014a425 v: v3 --- [refs] | 2 +- trunk/tools/perf/builtin-record.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b2b1072ce984..d2533ceef1f3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f41612f43be9575e1160460b08c3a760e6e27e1b +refs/heads/master: 18e6093904abfd51671ff5846c2fdaba9ebbf21b diff --git a/trunk/tools/perf/builtin-record.c b/trunk/tools/perf/builtin-record.c index f8fd14fb62ec..56bb4476e3ba 100644 --- a/trunk/tools/perf/builtin-record.c +++ b/trunk/tools/perf/builtin-record.c @@ -272,8 +272,15 @@ static void perf_record__open(struct perf_record *rec) exit(-1); } - if (perf_evlist__mmap(evlist, opts->mmap_pages, false) < 0) + if (perf_evlist__mmap(evlist, opts->mmap_pages, false) < 0) { + if (errno == EPERM) + die("Permission error mapping pages.\n" + "Consider increasing " + "/proc/sys/kernel/perf_event_mlock_kb,\n" + "or try again with a smaller value of -m/--mmap_pages.\n" + "(current value: %d)\n", opts->mmap_pages); die("failed to mmap with %d (%s)\n", errno, strerror(errno)); + } if (rec->file_new) session->evlist = evlist;