diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-06-08 10:12:12 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-06-08 10:12:12 +0200 |
| commit | a5506c46a4d249a422b0eca537026fc7a1ac78b5 (patch) | |
| tree | 6a463b0e6ac0ca16eb195a4f49a22afb1403337f /tools/perf/builtin-script.c | |
| parent | 36cc2b9222b5106de34085c4dd8635ac67ef5cba (diff) | |
| parent | cc1582c231ea041fbc68861dfaf957eaf902b829 (diff) | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/builtin-script.c')
| -rw-r--r-- | tools/perf/builtin-script.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index d05aec491cff..4761b0d7fcb5 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -2494,6 +2494,8 @@ int cmd_script(int argc, const char **argv) "Enable kernel symbol demangling"), OPT_STRING(0, "time", &script.time_str, "str", "Time span of interest (start,stop)"), + OPT_BOOLEAN(0, "inline", &symbol_conf.inline_name, + "Show inline function"), OPT_END() }; const char * const script_subcommands[] = { "record", "report", NULL }; |