2 files changed, 10 insertions, 5 deletions

diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c
index 64453d63b971..1c3cdaf228c1 100644
--- a/tools/perf/util/dso.c
+++ b/tools/perf/util/dso.c
@@ -292,7 +292,7 @@ dso_cache__read(struct dso *dso, struct machine *machine,
 
                 cache->offset = cache_offset;
                 cache->size   = ret;
-                dso_cache__insert(&dso->cache, cache);
+                dso_cache__insert(&dso->data.cache, cache);
 
                 ret = dso_cache__memcpy(cache, offset, data, size);
 
@@ -310,7 +310,7 @@ static ssize_t dso_cache_read(struct dso *dso, struct machine *machine,
 {
         struct dso_cache *cache;
 
-        cache = dso_cache__find(&dso->cache, offset);
+        cache = dso_cache__find(&dso->data.cache, offset);
         if (cache)
                 return dso_cache__memcpy(cache, offset, data, size);
         else
@@ -473,7 +473,7 @@ struct dso *dso__new(const char *name)
                 dso__set_short_name(dso, dso->name, false);
                 for (i = 0; i < MAP__NR_TYPES; ++i)
                         dso->symbols[i] = dso->symbol_names[i] = RB_ROOT;
-                dso->cache = RB_ROOT;
+                dso->data.cache = RB_ROOT;
                 dso->symtab_type = DSO_BINARY_TYPE__NOT_FOUND;
                 dso->binary_type = DSO_BINARY_TYPE__NOT_FOUND;
                 dso->loaded = 0;
@@ -506,7 +506,7 @@ void dso__delete(struct dso *dso)
                 dso->long_name_allocated = false;
         }
 
-        dso_cache__free(&dso->cache);
+        dso_cache__free(&dso->data.cache);
         dso__free_a2l(dso);
         zfree(&dso->symsrc_filename);
         free(dso);
diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h
index 38efe95a7fdd..7637fdd680b2 100644
--- a/tools/perf/util/dso.h
+++ b/tools/perf/util/dso.h
@@ -76,7 +76,6 @@ struct dso {
         struct list_head node;
         struct rb_root   symbols[MAP__NR_TYPES];
         struct rb_root   symbol_names[MAP__NR_TYPES];
-        struct rb_root   cache;
         void             *a2l;
         char             *symsrc_filename;
         unsigned int     a2l_fails;
@@ -99,6 +98,12 @@ struct dso {
         const char       *long_name;
         u16              long_name_len;
         u16              short_name_len;
+
+        /* dso data file */
+        struct {
+                struct rb_root   cache;
+        } data;
+
         char             name[0];
 };