Merge tag 'mmc-v3.17-1' of git://git.linaro.org/people/ulf.hansson/mmc

[firefly-linux-kernel-4.4.55.git] / tools / perf / builtin-inject.c

diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c
index 16c7c11ad06eace78b25e899096073633c71f8b9..9a02807387d6c25b9c41236f9404a88da5580a3f 100644 (file)
--- a/tools/perf/builtin-inject.c
+++ b/tools/perf/builtin-inject.c
@@ -389,6 +389,9 @@ static int __cmd_inject(struct perf_inject *inject)
        ret = perf_session__process_events(session, &inject->tool);
 
        if (!file_out->is_pipe) {
+               if (inject->build_ids)
+                       perf_header__set_feat(&session->header,
+                                             HEADER_BUILD_ID);
                session->header.data_size = inject->bytes_written;
                perf_session__write_header(session, session->evlist, file_out->fd, true);
        }
@@ -436,6 +439,8 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused)
                            "where and how long tasks slept"),
                OPT_INCR('v', "verbose", &verbose,
                         "be more verbose (show build ids, etc)"),
+               OPT_STRING(0, "kallsyms", &symbol_conf.kallsyms_name, "file",
+                          "kallsyms pathname"),
                OPT_END()
        };
        const char * const inject_usage[] = {