Merge tag 'efi-fixes-for-v6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / tools / perf / builtin-buildid-list.c

diff --git a/tools/perf/builtin-buildid-list.c b/tools/perf/builtin-buildid-list.c
index 00bfe89..c903747 100644 (file)
--- a/tools/perf/builtin-buildid-list.c
+++ b/tools/perf/builtin-buildid-list.c
@@ -8,7 +8,6 @@
  * Copyright (C) 2009, Arnaldo Carvalho de Melo <acme@redhat.com>
  */
 #include "builtin.h"
-#include "perf.h"
 #include "util/build-id.h"
 #include "util/debug.h"
 #include "util/dso.h"
@@ -18,19 +17,20 @@
 #include "util/session.h"
 #include "util/symbol.h"
 #include "util/data.h"
+#include "util/util.h"
 #include <errno.h>
 #include <inttypes.h>
 #include <linux/err.h>
 
 static int buildid__map_cb(struct map *map, void *arg __maybe_unused)
 {
-       const struct dso *dso = map->dso;
+       const struct dso *dso = map__dso(map);
        char bid_buf[SBUILD_ID_SIZE];
 
        memset(bid_buf, 0, sizeof(bid_buf));
        if (dso->has_build_id)
                build_id__sprintf(&dso->bid, bid_buf);
-       printf("%s %16" PRIx64 " %16" PRIx64, bid_buf, map->start, map->end);
+       printf("%s %16" PRIx64 " %16" PRIx64, bid_buf, map__start(map), map__end(map));
        if (dso->long_name != NULL) {
                printf(" %s", dso->long_name);
        } else if (dso->short_name != NULL) {