diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-06-02 09:54:57 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-06-02 09:54:57 +0800 |
| commit | 2ea80ad4205178dcea1152c0a603f23531c5412c (patch) | |
| tree | 98a470ee6e16fb0de4c403c4c4af942d6af5760c /tools/perf/builtin-inject.c | |
| parent | 510d0a3f869611dcd001a2b7627fa5dded4579af (diff) | |
| parent | 4a192f60855a84820d361ec58eda0d043faab6f6 (diff) | |
Merge remote-tracking branch 'v4.4/topic/coresight' into linux-linaro-lsk-v4.4
Diffstat (limited to 'tools/perf/builtin-inject.c')
| -rw-r--r-- | tools/perf/builtin-inject.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c index 99d127fe9c35..ac369c494036 100644 --- a/tools/perf/builtin-inject.c +++ b/tools/perf/builtin-inject.c @@ -626,12 +626,16 @@ static int __cmd_inject(struct perf_inject *inject) ret = perf_session__process_events(session); if (!file_out->is_pipe) { - if (inject->build_ids) { + if (inject->build_ids) perf_header__set_feat(&session->header, HEADER_BUILD_ID); - if (inject->have_auxtrace) - dsos__hit_all(session); - } + /* + * Keep all buildids when there is unprocessed AUX data because + * it is not known which ones the AUX trace hits. + */ + if (perf_header__has_feat(&session->header, HEADER_BUILD_ID) && + inject->have_auxtrace && !inject->itrace_synth_opts.set) + dsos__hit_all(session); /* * The AUX areas have been removed and replaced with * synthesized hardware events, so clear the feature flag and |