diff options
| author |   Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-06-22 13:56:50 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-06-22 13:56:50 -0300 |
| commit | ce09673636f9581d2e2e24af785c463c030a1fd8 (patch) | |
| tree | 5d696220bd70dcad7cc0809cf6e3225b4953bf05 /tools/perf/util/session.c | |
| parent | perf probe: Add --bootconfig to output definition in bootconfig format (diff) | |
| parent | Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm (diff) | |
| download | linux-dev-ce09673636f9581d2e2e24af785c463c030a1fd8.tar.xz linux-dev-ce09673636f9581d2e2e24af785c463c030a1fd8.zip | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes, since perf/urgent is already upstream.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/session.c')
| -rw-r--r-- | tools/perf/util/session.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 0dbb4f2628f3..86145dd699ca 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -1723,6 +1723,7 @@ int perf_session__peek_event(struct perf_session *session, off_t file_offset, if (event->header.size < hdr_sz || event->header.size > buf_sz) return -1; + buf += hdr_sz; rest = event->header.size - hdr_sz; if (readn(fd, buf, rest) != (ssize_t)rest) |