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 a59db7c..17cb1bb 100644 (file)
--- a/tools/perf/tests/topology.c
+++ b/tools/perf/tests/topology.c
@@ -30,12 +30,14 @@ static int get_temp(char *path)
 static int session_write_header(char *path)
 {
        struct perf_session *session;
-       struct perf_data_file file = {
-               .path = path,
-               .mode = PERF_DATA_MODE_WRITE,
+       struct perf_data data = {
+               .file      = {
+                       .path = path,
+               },
+               .mode      = PERF_DATA_MODE_WRITE,
        };
 
-       session = perf_session__new(&file, false, NULL);
+       session = perf_session__new(&data, false, NULL);
        TEST_ASSERT_VAL("can't get session", session);
 
        session->evlist = perf_evlist__new_default();
@@ -47,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, file.fd, true));
+                       !perf_session__write_header(session, session->evlist, data.file.fd, true));
 
        perf_session__delete(session);
 
@@ -57,13 +59,15 @@ static int session_write_header(char *path)
 static int check_cpu_topology(char *path, struct cpu_map *map)
 {
        struct perf_session *session;
-       struct perf_data_file file = {
-               .path = path,
-               .mode = PERF_DATA_MODE_READ,
+       struct perf_data data = {
+               .file      = {
+                       .path = path,
+               },
+               .mode      = PERF_DATA_MODE_READ,
        };
        int i;
 
-       session = perf_session__new(&file, false, NULL);
+       session = perf_session__new(&data, false, NULL);
        TEST_ASSERT_VAL("can't get session", session);
 
        for (i = 0; i < session->header.env.nr_cpus_avail; i++) {