Merge branch 'linus' into perf/core, to fix conflicts

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

diff --git a/tools/perf/util/jitdump.c b/tools/perf/util/jitdump.c
index 9084930..a186300 100644 (file)
--- a/tools/perf/util/jitdump.c
+++ b/tools/perf/util/jitdump.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <sys/sysmacros.h>
 #include <sys/types.h>
 #include <errno.h>
@@ -29,7 +30,7 @@
 #include "sane_ctype.h"
 
 struct jit_buf_desc {
-       struct perf_data_file *output;
+       struct perf_data *output;
        struct perf_session *session;
        struct machine *machine;
        union jr_entry   *entry;
@@ -60,8 +61,8 @@ struct debug_line_info {
 
 struct jit_tool {
        struct perf_tool tool;
-       struct perf_data_file   output;
-       struct perf_data_file   input;
+       struct perf_data        output;
+       struct perf_data        input;
        u64 bytes_written;
 };
 
@@ -356,7 +357,7 @@ jit_inject_event(struct jit_buf_desc *jd, union perf_event *event)
 {
        ssize_t size;
 
-       size = perf_data_file__write(jd->output, event, event->header.size);
+       size = perf_data__write(jd->output, event, event->header.size);
        if (size < 0)
                return -1;
 
@@ -751,7 +752,7 @@ jit_detect(char *mmap_name, pid_t pid)
 
 int
 jit_process(struct perf_session *session,
-           struct perf_data_file *output,
+           struct perf_data *output,
            struct machine *machine,
            char *filename,
            pid_t pid,