Merge tag 'perf-core-for-mingo-5.5-20190925' of git://git.kernel.org/pub/scm/linux...

[linux-2.6-microblaze.git] / tools / perf / util / build-id.c

diff --git a/tools/perf/util/build-id.c b/tools/perf/util/build-id.c
index f1abfab..c076fc7 100644 (file)
--- a/tools/perf/util/build-id.c
+++ b/tools/perf/util/build-id.c
@@ -7,12 +7,14 @@
  * Copyright (C) 2009, 2010 Red Hat Inc.
  * Copyright (C) 2009, 2010 Arnaldo Carvalho de Melo <acme@redhat.com>
  */
-#include "util.h"
+#include "util.h" // lsdir(), mkdir_p(), rm_rf()
 #include <dirent.h>
 #include <errno.h>
 #include <stdio.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include "util/copyfile.h"
+#include "dso.h"
 #include "build-id.h"
 #include "event.h"
 #include "namespaces.h"
@@ -37,7 +39,7 @@ static bool no_buildid_cache;
 int build_id__mark_dso_hit(struct perf_tool *tool __maybe_unused,
                           union perf_event *event,
                           struct perf_sample *sample,
-                          struct perf_evsel *evsel __maybe_unused,
+                          struct evsel *evsel __maybe_unused,
                           struct machine *machine)
 {
        struct addr_location al;
@@ -295,7 +297,7 @@ static int write_buildid(const char *name, size_t name_len, u8 *build_id,
                         pid_t pid, u16 misc, struct feat_fd *fd)
 {
        int err;
-       struct build_id_event b;
+       struct perf_record_header_build_id b;
        size_t len;
 
        len = name_len + 1;