diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2014-02-22 17:20:46 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-02-22 17:20:46 +0100 |
| commit | a9d3f94ec7708427b9f05a65246d3fd6e287fa51 (patch) | |
| tree | ef555c5c85e55d90c343af382b1042b2957c0584 /tools/perf/util/session.c | |
| parent | perf/x86/uncore: Fix IVT/SNB-EP uncore CBOX NID filter table (diff) | |
| parent | perf trace: Fix ioctl 'request' beautifier build problems on !(i386 || x86_64) arches (diff) | |
| download | linux-dev-a9d3f94ec7708427b9f05a65246d3fd6e287fa51.tar.xz linux-dev-a9d3f94ec7708427b9f05a65246d3fd6e287fa51.zip | |
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/urgent fixes from Arnaldo Carvalho de Melo:
* Handle PERF_RECORD_HEADER_EVENT_TYPE properly. (Jiri Olsa)
* Fix checking for supported events on older kernels in
'perf list' (Vince Weaver)
* Do not add offset twice to uprobe address in
'perf probe' (Masami Hiramatsu)
* Fix perf trace's ioctl 'request' beautifier build problems
on !(i386 || x86_64) arches (Arnaldo Carvalho de Melo)
* Fix 'perf trace' build by adding a fallback definition for
EFD_SEMAPHORE (Ben Hutchings)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/session.c')
| -rw-r--r-- | tools/perf/util/session.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 0b39a48e5110..5da6ce74c676 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -1008,6 +1008,12 @@ static int perf_session__process_user_event(struct perf_session *session, union if (err == 0) perf_session__set_id_hdr_size(session); return err; + case PERF_RECORD_HEADER_EVENT_TYPE: + /* + * Depreceated, but we need to handle it for sake + * of old data files create in pipe mode. + */ + return 0; case PERF_RECORD_HEADER_TRACING_DATA: /* setup for reading amidst mmap */ lseek(fd, file_offset, SEEK_SET); |