1 files changed, 15 insertions, 7 deletions

diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h
index 36d1a80c0b6c..752d75aebade 100644
--- a/tools/perf/util/session.h
+++ b/tools/perf/util/session.h
@@ -3,13 +3,13 @@
 
 #include "event.h"
 #include "header.h"
+#include "symbol.h"
 #include "thread.h"
 #include <linux/rbtree.h>
 #include "../../../include/linux/perf_event.h"
 
 struct ip_callchain;
 struct thread;
-struct symbol;
 
 struct perf_session {
         struct perf_header      header;
@@ -24,10 +24,7 @@ struct perf_session {
         unsigned long           unknown_events;
         struct rb_root          hists;
         u64                     sample_type;
-        struct {
-                const char      *name;
-                u64             addr;
-        }                       ref_reloc_sym;
+        struct ref_reloc_sym    ref_reloc_sym;
         int                     fd;
         int                     cwdlen;
         char                    *cwd;
@@ -69,9 +66,20 @@ int perf_header__read_build_ids(struct perf_header *self, int input,
 int perf_session__set_kallsyms_ref_reloc_sym(struct perf_session *self,
                                              const char *symbol_name,
                                              u64 addr);
-void perf_session__reloc_vmlinux_maps(struct perf_session *self,
-                                      u64 unrelocated_addr);
 
 void mem_bswap_64(void *src, int byte_size);
 
+static inline int __perf_session__create_kernel_maps(struct perf_session *self,
+                                                struct dso *kernel)
+{
+        return __map_groups__create_kernel_maps(&self->kmaps,
+                                                self->vmlinux_maps, kernel);
+}
+
+static inline struct map *
+        perf_session__new_module_map(struct perf_session *self,
+                                     u64 start, const char *filename)
+{
+        return map_groups__new_module(&self->kmaps, start, filename);
+}
 #endif /* __PERF_SESSION_H */