From 6c4abf2fb233b3971b47c3f1d9ce2efcaa1eb821 Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Mon, 31 Jan 2011 18:08:39 -0200
Subject: [PATCH] --- yaml --- r: 234380 b: refs/heads/master c:
 229ade9ba36341f7369ecb4f134bcec9133520bf h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/tools/perf/builtin-annotate.c | 2 +-
 trunk/tools/perf/builtin-report.c   | 2 +-
 trunk/tools/perf/util/cache.h       | 7 ++++---
 trunk/tools/perf/util/ui/setup.c    | 5 +++--
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 3b2cb4974515..f1364dc70d8a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c3e10eb1968877d6a1957b7e790c6ce01bd56fc
+refs/heads/master: 229ade9ba36341f7369ecb4f134bcec9133520bf
diff --git a/trunk/tools/perf/builtin-annotate.c b/trunk/tools/perf/builtin-annotate.c
index 70067862e07f..cd9dec46c19f 100644
--- a/trunk/tools/perf/builtin-annotate.c
+++ b/trunk/tools/perf/builtin-annotate.c
@@ -452,7 +452,7 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __used)
 	else if (use_tui)
 		use_browser = 1;
 
-	setup_browser();
+	setup_browser(true);
 
 	symbol_conf.priv_size = sizeof(struct sym_priv);
 	symbol_conf.try_vmlinux_path = true;
diff --git a/trunk/tools/perf/builtin-report.c b/trunk/tools/perf/builtin-report.c
index a6a4e5457b6f..080937c3a656 100644
--- a/trunk/tools/perf/builtin-report.c
+++ b/trunk/tools/perf/builtin-report.c
@@ -499,7 +499,7 @@ int cmd_report(int argc, const char **argv, const char *prefix __used)
 		use_browser = 1;
 
 	if (strcmp(input_name, "-") != 0)
-		setup_browser();
+		setup_browser(true);
 	else
 		use_browser = 0;
 	/*
diff --git a/trunk/tools/perf/util/cache.h b/trunk/tools/perf/util/cache.h
index a7729797fd96..fc5e5a09d5b9 100644
--- a/trunk/tools/perf/util/cache.h
+++ b/trunk/tools/perf/util/cache.h
@@ -34,13 +34,14 @@ extern int pager_use_color;
 extern int use_browser;
 
 #ifdef NO_NEWT_SUPPORT
-static inline void setup_browser(void)
+static inline void setup_browser(bool fallback_to_pager)
 {
-	setup_pager();
+	if (fallback_to_pager)
+		setup_pager();
 }
 static inline void exit_browser(bool wait_for_ok __used) {}
 #else
-void setup_browser(void);
+void setup_browser(bool fallback_to_pager);
 void exit_browser(bool wait_for_ok);
 #endif
 
diff --git a/trunk/tools/perf/util/ui/setup.c b/trunk/tools/perf/util/ui/setup.c
index 662085032eb7..fbf1a145492f 100644
--- a/trunk/tools/perf/util/ui/setup.c
+++ b/trunk/tools/perf/util/ui/setup.c
@@ -14,11 +14,12 @@ static void newt_suspend(void *d __used)
 	newtResume();
 }
 
-void setup_browser(void)
+void setup_browser(bool fallback_to_pager)
 {
 	if (!isatty(1) || !use_browser || dump_trace) {
 		use_browser = 0;
-		setup_pager();
+		if (fallback_to_pager)
+			setup_pager();
 		return;
 	}