Merge branch 'perf' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core

2 files changed, 7 insertions, 4 deletions

diff --git a/tools/perf/util/cache.h b/tools/perf/util/cache.h
index 5eca52595b62..65fe664fddf6 100644
--- a/tools/perf/util/cache.h
+++ b/tools/perf/util/cache.h
@@ -30,7 +30,7 @@ extern const char *pager_program;
 extern int pager_in_use(void);
 extern int pager_use_color;
 
-extern bool use_browser;
+extern int use_browser;
 
 #ifdef NO_NEWT_SUPPORT
 static inline void setup_browser(void)
diff --git a/tools/perf/util/newt.c b/tools/perf/util/newt.c
index 051022eb5f43..0b45658f7497 100644
--- a/tools/perf/util/newt.c
+++ b/tools/perf/util/newt.c
@@ -1068,10 +1068,13 @@ static struct newtPercentTreeColors {
 void setup_browser(void)
 {
         struct newtPercentTreeColors *c = &defaultPercentTreeColors;
-        if (!isatty(1))
+
+        if (!isatty(1) || !use_browser) {
+                setup_pager();
                 return;
+        }
 
-        use_browser = true;
+        use_browser = 1;
         newtInit();
         newtCls();
         ui_helpline__puts(" ");
@@ -1084,7 +1087,7 @@ void setup_browser(void)
 
 void exit_browser(bool wait_for_ok)
 {
-        if (use_browser) {
+        if (use_browser > 0) {
                 if (wait_for_ok) {
                         char title[] = "Fatal Error", ok[] = "Ok";
                         newtWinMessage(title, ok, browser__last_msg);