3 files changed, 14 insertions, 14 deletions

diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c
index eef166212324..4ddeecb9ff85 100644
--- a/tools/perf/util/dso.c
+++ b/tools/perf/util/dso.c
@@ -148,7 +148,7 @@ static int open_dso(struct dso *dso, struct machine *machine)
         if (machine)
                 root_dir = machine->root_dir;
 
-        if (dso__read_binary_type_filename(dso, dso->data_type,
+        if (dso__read_binary_type_filename(dso, dso->binary_type,
                                             root_dir, name, PATH_MAX)) {
                 free(name);
                 return -EINVAL;
@@ -168,19 +168,19 @@ int dso__data_fd(struct dso *dso, struct machine *machine)
         };
         int i = 0;
 
-        if (dso->data_type != DSO_BINARY_TYPE__NOT_FOUND)
+        if (dso->binary_type != DSO_BINARY_TYPE__NOT_FOUND)
                 return open_dso(dso, machine);
 
         do {
                 int fd;
 
-                dso->data_type = binary_type_data[i++];
+                dso->binary_type = binary_type_data[i++];
 
                 fd = open_dso(dso, machine);
                 if (fd >= 0)
                         return fd;
 
-        } while (dso->data_type != DSO_BINARY_TYPE__NOT_FOUND);
+        } while (dso->binary_type != DSO_BINARY_TYPE__NOT_FOUND);
 
         return -EINVAL;
 }
@@ -475,7 +475,7 @@ struct dso *dso__new(const char *name)
                         dso->symbols[i] = dso->symbol_names[i] = RB_ROOT;
                 dso->cache = RB_ROOT;
                 dso->symtab_type = DSO_BINARY_TYPE__NOT_FOUND;
-                dso->data_type   = DSO_BINARY_TYPE__NOT_FOUND;
+                dso->binary_type = DSO_BINARY_TYPE__NOT_FOUND;
                 dso->loaded = 0;
                 dso->rel = 0;
                 dso->sorted_by_name = 0;
diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h
index aa3384745d75..cd7d6f078cdd 100644
--- a/tools/perf/util/dso.h
+++ b/tools/perf/util/dso.h
@@ -83,7 +83,7 @@ struct dso {
         enum dso_kernel_type    kernel;
         enum dso_swap_type      needs_swap;
         enum dso_binary_type    symtab_type;
-        enum dso_binary_type    data_type;
+        enum dso_binary_type    binary_type;
         u8               adjust_symbols:1;
         u8               has_build_id:1;
         u8               has_srcline:1;
@@ -159,14 +159,14 @@ size_t dso__fprintf(struct dso *dso, enum map_type type, FILE *fp);
 
 static inline bool dso__is_vmlinux(struct dso *dso)
 {
-        return dso->data_type == DSO_BINARY_TYPE__VMLINUX ||
-               dso->data_type == DSO_BINARY_TYPE__GUEST_VMLINUX;
+        return dso->binary_type == DSO_BINARY_TYPE__VMLINUX ||
+               dso->binary_type == DSO_BINARY_TYPE__GUEST_VMLINUX;
 }
 
 static inline bool dso__is_kcore(struct dso *dso)
 {
-        return dso->data_type == DSO_BINARY_TYPE__KCORE ||
-               dso->data_type == DSO_BINARY_TYPE__GUEST_KCORE;
+        return dso->binary_type == DSO_BINARY_TYPE__KCORE ||
+               dso->binary_type == DSO_BINARY_TYPE__GUEST_KCORE;
 }
 
 void dso__free_a2l(struct dso *dso);
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 9ee4b80dac57..923d00040bbf 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -1089,9 +1089,9 @@ static int dso__load_kcore(struct dso *dso, struct map *map,
          * dso__data_read_addr().
          */
         if (dso->kernel == DSO_TYPE_GUEST_KERNEL)
-                dso->data_type = DSO_BINARY_TYPE__GUEST_KCORE;
+                dso->binary_type = DSO_BINARY_TYPE__GUEST_KCORE;
         else
-                dso->data_type = DSO_BINARY_TYPE__KCORE;
+                dso->binary_type = DSO_BINARY_TYPE__KCORE;
         dso__set_long_name(dso, strdup(kcore_filename), true);
 
         close(fd);
@@ -1368,9 +1368,9 @@ int dso__load_vmlinux(struct dso *dso, struct map *map,
 
         if (err > 0) {
                 if (dso->kernel == DSO_TYPE_GUEST_KERNEL)
-                        dso->data_type = DSO_BINARY_TYPE__GUEST_VMLINUX;
+                        dso->binary_type = DSO_BINARY_TYPE__GUEST_VMLINUX;
                 else
-                        dso->data_type = DSO_BINARY_TYPE__VMLINUX;
+                        dso->binary_type = DSO_BINARY_TYPE__VMLINUX;
                 dso__set_long_name(dso, vmlinux, vmlinux_allocated);
                 dso__set_loaded(dso, map->type);
                 pr_debug("Using %s for symbols\n", symfs_vmlinux);