aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2010-03-12 21:05:10 -0300
committerIngo Molnar <mingo@elte.hu>2010-03-13 08:23:37 +0100
commit567e54790e5c07152a93b6de4d0210af8b77da87 (patch)
tree075fdcbd2d2a868feda3911f6782f117c2dea7a2 /tools/perf
parent0308635917273030db6121d67c41ef2279b30340 (diff)
downloadmrst-s0i3-test-567e54790e5c07152a93b6de4d0210af8b77da87.tar.gz
mrst-s0i3-test-567e54790e5c07152a93b6de4d0210af8b77da87.tar.xz
mrst-s0i3-test-567e54790e5c07152a93b6de4d0210af8b77da87.zip
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>
Diffstat (limited to 'tools/perf')
-rw-r--r--tools/perf/perf.c2
-rw-r--r--tools/perf/util/debug.h8
-rw-r--r--tools/perf/util/newt.c2
3 files changed, 10 insertions, 2 deletions
diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index 9ff186b57cb..0d4b9edfab1 100644
--- 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 03accb86799..0172edf3f15 100644
--- 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 f6ec6f5c0fd..2836394459d 100644
--- 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))