diff options
author | Jiri Olsa <jolsa@redhat.com> | 2012-10-20 10:33:19 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-10-29 10:14:59 -0400 |
commit | 0089fa9831f3752869143c7928adb94ac6353085 (patch) | |
tree | f13e551a5b5856a5a1cc97853d631abb9b09857e /tools/perf | |
parent | e84ba4e26833991d1c1c15a592b1474ee2b6dfdb (diff) |
perf record: Fix mmap error output condition
The mmap_pages default value is not power of 2 (UINT_MAX).
Together with perf_evlist__mmap function returning error value different
from EPERM, we get misleading error message: "--mmap_pages/-m value must
be a power of two."
Fixing this by adding extra check for UINT_MAX value for this error
condition.
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1350743599-4805-12-git-send-email-jolsa@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
-rw-r--r-- | tools/perf/builtin-record.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 53c9892e96dd..5783c3225116 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c | |||
@@ -363,7 +363,8 @@ try_again: | |||
363 | "or try again with a smaller value of -m/--mmap_pages.\n" | 363 | "or try again with a smaller value of -m/--mmap_pages.\n" |
364 | "(current value: %d)\n", opts->mmap_pages); | 364 | "(current value: %d)\n", opts->mmap_pages); |
365 | rc = -errno; | 365 | rc = -errno; |
366 | } else if (!is_power_of_2(opts->mmap_pages)) { | 366 | } else if (!is_power_of_2(opts->mmap_pages) && |
367 | (opts->mmap_pages != UINT_MAX)) { | ||
367 | pr_err("--mmap_pages/-m value must be a power of two."); | 368 | pr_err("--mmap_pages/-m value must be a power of two."); |
368 | rc = -EINVAL; | 369 | rc = -EINVAL; |
369 | } else { | 370 | } else { |