Commit-ID: e5d4a290da5366c397653c47c3e869a67b1bfa07 Gitweb: http://git.kernel.org/tip/e5d4a290da5366c397653c47c3e869a67b1bfa07 Author: Arnaldo Carvalho de Melo <a...@redhat.com> AuthorDate: Fri, 12 Dec 2014 15:59:51 -0300 Committer: Arnaldo Carvalho de Melo <a...@redhat.com> CommitDate: Tue, 16 Dec 2014 13:38:26 -0300
perf evlist: Clarify sterror_mmap variable names Prep patch for doing further checks like when the number of pages that is being attempted is actually below /proc/sys/kernel/perf_event_mlock_kb but the operation fails because the user doesn't have CAP_IPC_LOCK. Cc: Adrian Hunter <adrian.hun...@intel.com> Cc: Borislav Petkov <b...@suse.de> Cc: David Ahern <dsah...@gmail.com> Cc: Don Zickus <dzic...@redhat.com> Cc: Frederic Weisbecker <fweis...@gmail.com> Cc: Jiri Olsa <jo...@redhat.com> Cc: Mike Galbraith <efa...@gmx.de> Cc: Namhyung Kim <namhy...@kernel.org> Cc: Paul Mackerras <pau...@samba.org> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Stephane Eranian <eran...@google.com> Link: http://lkml.kernel.org/n/tip-wetzlux7mzvofu5cuji5i...@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> --- tools/perf/util/evlist.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index de7515d..d661f25 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -1487,16 +1487,16 @@ int perf_evlist__strerror_open(struct perf_evlist *evlist __maybe_unused, int perf_evlist__strerror_mmap(struct perf_evlist *evlist, int err, char *buf, size_t size) { char sbuf[STRERR_BUFSIZE], *emsg = strerror_r(err, sbuf, sizeof(sbuf)); - int value; + int pages_attempted = evlist->mmap_len / 1024, pages_max_per_user; switch (err) { case EPERM: - sysctl__read_int("kernel/perf_event_mlock_kb", &value); + sysctl__read_int("kernel/perf_event_mlock_kb", &pages_max_per_user); scnprintf(buf, size, "Error:\t%s.\n" "Hint:\tCheck /proc/sys/kernel/perf_event_mlock_kb (%d kB) setting.\n" "Hint:\tTried using %zd kB.\n" "Hint:\tTry using a smaller -m/--mmap-pages value.", - emsg, value, evlist->mmap_len / 1024); + emsg, pages_max_per_user, pages_attempted); break; default: scnprintf(buf, size, "%s", emsg); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
