diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2012-06-06 08:40:10 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-06-06 08:46:33 +0200 |
| commit | 02e03040a3fda866e5d1018734bd5b5ede997043 (patch) | |
| tree | 5bb2b9ea8c25504cd45a79d576839bafe6610dd0 /tools/perf/util/pager.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse (diff) | |
| parent | perf: Remove duplicate invocation on perf_event_for_each (diff) | |
| download | linux-dev-02e03040a3fda866e5d1018734bd5b5ede997043.tar.xz linux-dev-02e03040a3fda866e5d1018734bd5b5ede997043.zip | |
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf fixes from Arnaldo Carvalho de Melo:
* Endianness fixes from Jiri Olsa
* Fixes for make perf tarball
* Fix for DSO name in perf script callchains, from David Ahern
* Segfault fixes for perf top --callchain, from Namhyung Kim
* Minor function result fixes from Srikar Dronamraju
* Add missing 3rd ioctl parameter, from Namhyung Kim
* Fix pager usage in minimal embedded systems, from Avik Sil
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/pager.c')
| -rw-r--r-- | tools/perf/util/pager.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/perf/util/pager.c b/tools/perf/util/pager.c index 1915de20dcac..3322b8446e89 100644 --- a/tools/perf/util/pager.c +++ b/tools/perf/util/pager.c @@ -57,6 +57,10 @@ void setup_pager(void) } if (!pager) pager = getenv("PAGER"); + if (!pager) { + if (!access("/usr/bin/pager", X_OK)) + pager = "/usr/bin/pager"; + } if (!pager) pager = "less"; else if (!*pager || !strcmp(pager, "cat")) |