perf tools: Fix non-newt build

The use_browser needs to be in a file that is always built and
also we need a browser__show_help stub in that case.

Reported-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1268438710-32697-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index 9ff186b57cb7715f5d9cfdae8e7590543038ffce..0d4b9edfab1246f5add6bec7d3bb46d16f0bc7e3 100644 (file)
--- a/tools/perf/perf.c
+++ b/tools/perf/perf.c
@@ -16,6 +16,8 @@
 #include "util/string.h"
 #include "util/debugfs.h"
 
+bool use_browser;
+
 const char perf_usage_string[] =
        "perf [--version] [--help] COMMAND [ARGS]";
 

diff --git a/tools/perf/util/debug.h b/tools/perf/util/debug.h
index 03accb867996a5523070f34fed2a1b609f903f01..0172edf3f1533bf4f33991dedda6fcf435edba14 100644 (file)
--- a/tools/perf/util/debug.h
+++ b/tools/perf/util/debug.h
@@ -9,6 +9,14 @@ extern int dump_trace;
 
 int dump_printf(const char *fmt, ...) __attribute__((format(printf, 1, 2)));
 void trace_event(event_t *event);
+
+#ifdef NO_NEWT_SUPPORT
+static inline int browser__show_help(const char *format __used, va_list ap __used)
+{
+       return 0;
+}
+#else
 int browser__show_help(const char *format, va_list ap);
+#endif
 
 #endif /* __PERF_DEBUG_H */

diff --git a/tools/perf/util/newt.c b/tools/perf/util/newt.c
index f6ec6f5c0fd9722e0b929ad056eae67f0588a01c..2836394459d9bc53a8941e51fc73956bd06ad57d 100644 (file)
--- a/tools/perf/util/newt.c
+++ b/tools/perf/util/newt.c
@@ -189,8 +189,6 @@ int browser__show_help(const char *format, va_list ap)
        return ret;
 }
 
-bool use_browser;
-
 void setup_browser(void)
 {
        if (!isatty(1))