diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2010-05-17 22:26:53 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2010-05-18 00:35:23 -0400 |
| commit | f0218b3e9974f06014b61be8987159f4a20e011e (patch) | |
| tree | 29a593c4d71ab18cb0c450a34e79bf6bea66877e /tools/perf/builtin-help.c | |
| parent | 1eaa4787a774c4896518c81f24e8bccaa2244924 (diff) | |
| parent | 9d192e118a094087494997ea1c8a2faf39af38c5 (diff) | |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/core-6
Conflicts:
include/trace/ftrace.h
kernel/trace/trace_kprobe.c
Acked-by: Masami Hiramatsu <mhiramat@redhat.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'tools/perf/builtin-help.c')
| -rw-r--r-- | tools/perf/builtin-help.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/builtin-help.c b/tools/perf/builtin-help.c index 215b584007b1..81e3ecc40fc7 100644 --- a/tools/perf/builtin-help.c +++ b/tools/perf/builtin-help.c | |||
| @@ -29,7 +29,7 @@ enum help_format { | |||
| 29 | HELP_FORMAT_WEB, | 29 | HELP_FORMAT_WEB, |
| 30 | }; | 30 | }; |
| 31 | 31 | ||
| 32 | static int show_all = 0; | 32 | static bool show_all = false; |
| 33 | static enum help_format help_format = HELP_FORMAT_MAN; | 33 | static enum help_format help_format = HELP_FORMAT_MAN; |
| 34 | static struct option builtin_help_options[] = { | 34 | static struct option builtin_help_options[] = { |
| 35 | OPT_BOOLEAN('a', "all", &show_all, "print all available commands"), | 35 | OPT_BOOLEAN('a', "all", &show_all, "print all available commands"), |