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

[linux-2.6-microblaze.git] / tools / perf / tests / topology.c

diff --git a/tools/perf/tests/topology.c b/tools/perf/tests/topology.c
index 7536782..17cb1bb 100644 (file)
--- a/tools/perf/tests/topology.c
+++ b/tools/perf/tests/topology.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -30,8 +31,10 @@ static int session_write_header(char *path)
 {
        struct perf_session *session;
        struct perf_data data = {
-               .path = path,
-               .mode = PERF_DATA_MODE_WRITE,
+               .file      = {
+                       .path = path,
+               },
+               .mode      = PERF_DATA_MODE_WRITE,
        };
 
        session = perf_session__new(&data, false, NULL);
@@ -46,7 +49,7 @@ static int session_write_header(char *path)
        session->header.data_size += DATA_SIZE;
 
        TEST_ASSERT_VAL("failed to write header",
-                       !perf_session__write_header(session, session->evlist, data.fd, true));
+                       !perf_session__write_header(session, session->evlist, data.file.fd, true));
 
        perf_session__delete(session);
 
@@ -57,8 +60,10 @@ static int check_cpu_topology(char *path, struct cpu_map *map)
 {
        struct perf_session *session;
        struct perf_data data = {
-               .path = path,
-               .mode = PERF_DATA_MODE_READ,
+               .file      = {
+                       .path = path,
+               },
+               .mode      = PERF_DATA_MODE_READ,
        };
        int i;