Merge remote-tracking branch 'ipsec/master'

[karo-tx-linux.git] / tools / perf / util / map.c

diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index b1c475d9b240393e73614bc249e9e4b3dc2eedfc..4e38c396a897ad9599d1addb1fb464b5cdfa4129 100644 (file)
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -235,7 +235,7 @@ struct map *map__new2(u64 start, struct dso *dso, enum map_type type)
  */
 bool __map__is_kernel(const struct map *map)
 {
-       return map->groups->machine->vmlinux_maps[map->type] == map;
+       return __machine__kernel_map(map->groups->machine, map->type) == map;
 }
 
 static void map__exit(struct map *map)
@@ -553,13 +553,9 @@ struct symbol *map_groups__find_symbol(struct map_groups *mg,
        return NULL;
 }
 
-struct symbol *map_groups__find_symbol_by_name(struct map_groups *mg,
-                                              enum map_type type,
-                                              const char *name,
-                                              struct map **mapp,
-                                              symbol_filter_t filter)
+struct symbol *maps__find_symbol_by_name(struct maps *maps, const char *name,
+                                        struct map **mapp, symbol_filter_t filter)
 {
-       struct maps *maps = &mg->maps[type];
        struct symbol *sym;
        struct rb_node *nd;
 
@@ -583,6 +579,17 @@ out:
        return sym;
 }
 
+struct symbol *map_groups__find_symbol_by_name(struct map_groups *mg,
+                                              enum map_type type,
+                                              const char *name,
+                                              struct map **mapp,
+                                              symbol_filter_t filter)
+{
+       struct symbol *sym = maps__find_symbol_by_name(&mg->maps[type], name, mapp, filter);
+
+       return sym;
+}
+
 int map_groups__find_ams(struct addr_map_symbol *ams, symbol_filter_t filter)
 {
        if (ams->addr < ams->map->start || ams->addr >= ams->map->end) {