aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/builtin-report.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-12-09 18:31:30 -0500
committerIngo Molnar <mingo@elte.hu>2010-12-09 18:31:30 -0500
commit67b96c182c36c83cd6881122b4a7922b2634047b (patch)
tree600cdd9b5f2682ae2e040f580a76eb5195ef45d4 /tools/perf/builtin-report.c
parentefc70d241f5c7fc0a9f1c2a01781ed946d9dbe21 (diff)
parentddbc24b72c2c3f3f0182bbc2cb70b31c52a6f45b (diff)
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core
Diffstat (limited to 'tools/perf/builtin-report.c')
-rw-r--r--tools/perf/builtin-report.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 904519fba434..b6a2a899aa8f 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -443,6 +443,8 @@ static const struct option options[] = {
443 "dump raw trace in ASCII"), 443 "dump raw trace in ASCII"),
444 OPT_STRING('k', "vmlinux", &symbol_conf.vmlinux_name, 444 OPT_STRING('k', "vmlinux", &symbol_conf.vmlinux_name,
445 "file", "vmlinux pathname"), 445 "file", "vmlinux pathname"),
446 OPT_STRING(0, "kallsyms", &symbol_conf.kallsyms_name,
447 "file", "kallsyms pathname"),
446 OPT_BOOLEAN('f', "force", &force, "don't complain, do it"), 448 OPT_BOOLEAN('f', "force", &force, "don't complain, do it"),
447 OPT_BOOLEAN('m', "modules", &symbol_conf.use_modules, 449 OPT_BOOLEAN('m', "modules", &symbol_conf.use_modules,
448 "load module symbols - WARNING: use only with -k and LIVE kernel"), 450 "load module symbols - WARNING: use only with -k and LIVE kernel"),