Merge tag 'mmc-v4.3' of git://git.linaro.org/people/ulf.hansson/mmc

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

diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index b5a5e9c024379652fccd722d7da2739169e0ab5d..b1c475d9b240393e73614bc249e9e4b3dc2eedfc 100644 (file)
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -224,6 +224,20 @@ struct map *map__new2(u64 start, struct dso *dso, enum map_type type)
        return map;
 }
 
+/*
+ * Use this and __map__is_kmodule() for map instances that are in
+ * machine->kmaps, and thus have map->groups->machine all properly set, to
+ * disambiguate between the kernel and modules.
+ *
+ * When the need arises, introduce map__is_{kernel,kmodule)() that
+ * checks (map->groups != NULL && map->groups->machine != NULL &&
+ * map->dso->kernel) before calling __map__is_{kernel,kmodule}())
+ */
+bool __map__is_kernel(const struct map *map)
+{
+       return map->groups->machine->vmlinux_maps[map->type] == map;
+}
+
 static void map__exit(struct map *map)
 {
        BUG_ON(!RB_EMPTY_NODE(&map->rb_node));
@@ -334,9 +348,18 @@ struct symbol *map__find_symbol_by_name(struct map *map, const char *name,
        return dso__find_symbol_by_name(map->dso, map->type, name);
 }
 
-struct map *map__clone(struct map *map)
+struct map *map__clone(struct map *from)
 {
-       return memdup(map, sizeof(*map));
+       struct map *map = memdup(from, sizeof(*map));
+
+       if (map != NULL) {
+               atomic_set(&map->refcnt, 1);
+               RB_CLEAR_NODE(&map->rb_node);
+               dso__get(map->dso);
+               map->groups = NULL;
+       }
+
+       return map;
 }
 
 int map__overlap(struct map *l, struct map *r)