Merge tag 'trace-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[linux-2.6-microblaze.git] / tools / perf / util / intel-pt.c

diff --git a/tools/perf/util/intel-pt.c b/tools/perf/util/intel-pt.c
index b58f9fd..23f9ba6 100644 (file)
--- a/tools/perf/util/intel-pt.c
+++ b/tools/perf/util/intel-pt.c
@@ -271,7 +271,7 @@ next:
        ptq->buffer = buffer;
 
        if (!buffer->data) {
-               int fd = perf_data_file__fd(ptq->pt->session->file);
+               int fd = perf_data__fd(ptq->pt->session->data);
 
                buffer->data = auxtrace_buffer__get_data(buffer, fd);
                if (!buffer->data)
@@ -2084,10 +2084,10 @@ static int intel_pt_process_auxtrace_event(struct perf_session *session,
        if (!pt->data_queued) {
                struct auxtrace_buffer *buffer;
                off_t data_offset;
-               int fd = perf_data_file__fd(session->file);
+               int fd = perf_data__fd(session->data);
                int err;
 
-               if (perf_data_file__is_pipe(session->file)) {
+               if (perf_data__is_pipe(session->data)) {
                        data_offset = 0;
                } else {
                        data_offset = lseek(fd, 0, SEEK_CUR);