diff options
| author | Arnaldo Carvalho de Melo | 2014-02-18 13:33:10 +0100 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo | 2014-02-18 13:33:10 +0100 |
| commit | e985a6c675950af10131fdce4d46481d655c6b60 (patch) | |
| tree | 970b5d7493958b6717a2c6ef1938bdaeba58129f /tools/perf/util/session.c | |
| parent | perf/x86/p4: Block PMIs on init to prevent a stream of unkown NMIs (diff) | |
| parent | perf trace: Fix ioctl 'request' beautifier build problems on !(i386 || x86_64... (diff) | |
| download | kernel-qcow2-linux-e985a6c675950af10131fdce4d46481d655c6b60.tar.gz kernel-qcow2-linux-e985a6c675950af10131fdce4d46481d655c6b60.tar.xz kernel-qcow2-linux-e985a6c675950af10131fdce4d46481d655c6b60.zip | |
Merge remote-tracking branch 'acme/perf/urgent' into perf/core
To have some 'perf probe' related fixes needed for further devel work in
this tool.
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 | 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); |