diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-30 15:35:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-30 15:35:01 -0400 |
commit | bc7d352c5e76c74c628a39b99777a1bdddde5e81 (patch) | |
tree | 3cc0a80defb54d284e2a9a1e69b1224064921775 /tools/perf/util/newt.c | |
parent | b3f2f6cd1ff935ecac9a5346904b899d7af689fe (diff) | |
parent | 92af1abde4f2d74c9e5f7b670a1971779ed0b051 (diff) |
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf tui: Fix last use_browser problem related to .perfconfig
perf symbols: Add the build id cache to the vmlinux path
perf tui: Reset use_browser if stdout is not a tty
ring-buffer: Move zeroing out excess in page to ring buffer code
ring-buffer: Reset "real_end" when page is filled
Diffstat (limited to 'tools/perf/util/newt.c')
-rw-r--r-- | tools/perf/util/newt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/util/newt.c b/tools/perf/util/newt.c index d54c540f49db..cf182ca132fe 100644 --- a/tools/perf/util/newt.c +++ b/tools/perf/util/newt.c | |||
@@ -1139,6 +1139,7 @@ void setup_browser(void) | |||
1139 | struct newtPercentTreeColors *c = &defaultPercentTreeColors; | 1139 | struct newtPercentTreeColors *c = &defaultPercentTreeColors; |
1140 | 1140 | ||
1141 | if (!isatty(1) || !use_browser || dump_trace) { | 1141 | if (!isatty(1) || !use_browser || dump_trace) { |
1142 | use_browser = 0; | ||
1142 | setup_pager(); | 1143 | setup_pager(); |
1143 | return; | 1144 | return; |
1144 | } | 1145 | } |