diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-10-26 17:03:02 +0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-10-26 17:03:02 +0300 |
| commit | 3a55445f11e6b1dbdc1e7f2684a519089d2e163c (patch) | |
| tree | ce449fbd02b8dde1adf10bf4e2f291c9fa1fe4dc /tools/perf/util | |
| parent | 342cb7ebf5e29fff4dc09ab2c8f37d710f8f5206 (diff) | |
| parent | 3906fe9bb7f1a2c8667ae54e967dc8690824f4ea (diff) | |
| download | linux-3a55445f11e6b1dbdc1e7f2684a519089d2e163c.tar.xz | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up the fixes from upstream.
Fix simple conflict on session.c related to the file position fix that
went upstream and is touched by the active decomp changes in perf/core.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util')
| -rw-r--r-- | tools/perf/util/session.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 51bf2efceb7f..d8857d1b6d7c 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -2122,7 +2122,7 @@ fetch_decomp_event(u64 head, size_t mmap_size, char *buf, bool needs_swap) static int __perf_session__process_decomp_events(struct perf_session *session) { s64 skip; - u64 size, file_pos = 0; + u64 size; struct decomp *decomp = session->active_decomp->decomp_last; if (!decomp) @@ -2138,7 +2138,7 @@ static int __perf_session__process_decomp_events(struct perf_session *session) size = event->header.size; if (size < sizeof(struct perf_event_header) || - (skip = perf_session__process_event(session, event, file_pos)) < 0) { + (skip = perf_session__process_event(session, event, decomp->file_pos)) < 0) { pr_err("%#" PRIx64 " [%#x]: failed to process type: %d\n", decomp->file_pos + decomp->head, event->header.size, event->header.type); return -EINVAL; |