Skip to content

Commit

Permalink
perf tools: Fix non-newt build
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Arnaldo Carvalho de Melo authored and Ingo Molnar committed Mar 13, 2010
1 parent 0308635 commit 567e547
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
2 changes: 2 additions & 0 deletions tools/perf/perf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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]";

Expand Down
8 changes: 8 additions & 0 deletions tools/perf/util/debug.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
2 changes: 0 additions & 2 deletions tools/perf/util/newt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down

0 comments on commit 567e547

Please sign in to comment.