diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-12-06 08:54:41 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-12-06 08:54:41 +0100 |
| commit | 0f60a0bcc1b96d531fa623ab520f863f1292c75b (patch) | |
| tree | 30560c020dfcab8b05519732edd16810e3059b3c /tools/perf/builtin-inject.c | |
| parent | 9f58c93efdffc2cba91fdcee010b3e5e8860334d (diff) | |
| parent | fd9bee5e24141d00e23b66d1b51bc759efa7e3fe (diff) | |
Merge tag 'perf-urgent-for-mingo-5.5-20191205' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf fixes from Arnaldo Carvalho de Melo:
perf inject:
Adrian Hunter:
- Fix processing of ID index for injected instruction tracing
perf report:
Ravi Bangoria:
- Replace pr_err() with ui__error(), so that we can see the output
in the TUI mode instead of showing and immediately restoring the
screen to the state before perf was started.
- Don't start --mem-mode/--branch-mode mode if required samples are not
available.
tools headers UAPI:
Arnaldo Carvalho de Melo:
- Sync drm/i915_drm.h with the kernel sources
- Update tools's copy of drm.h headers.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/builtin-inject.c')
| -rw-r--r-- | tools/perf/builtin-inject.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c index 9664a72a089d..7e124a7b8bfd 100644 --- a/tools/perf/builtin-inject.c +++ b/tools/perf/builtin-inject.c @@ -403,17 +403,6 @@ static int perf_event__repipe_tracing_data(struct perf_session *session, return err; } -static int perf_event__repipe_id_index(struct perf_session *session, - union perf_event *event) -{ - int err; - - perf_event__repipe_synth(session->tool, event); - err = perf_event__process_id_index(session, event); - - return err; -} - static int dso__read_build_id(struct dso *dso) { if (dso->has_build_id) @@ -651,7 +640,7 @@ static int __cmd_inject(struct perf_inject *inject) inject->tool.comm = perf_event__repipe_comm; inject->tool.namespaces = perf_event__repipe_namespaces; inject->tool.exit = perf_event__repipe_exit; - inject->tool.id_index = perf_event__repipe_id_index; + inject->tool.id_index = perf_event__process_id_index; inject->tool.auxtrace_info = perf_event__process_auxtrace_info; inject->tool.auxtrace = perf_event__process_auxtrace; inject->tool.aux = perf_event__drop_aux; |