Add and use a generic version of devmem_is_allowed()

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

diff --git a/tools/perf/builtin-buildid-cache.c b/tools/perf/builtin-buildid-cache.c
index 39efa51..a254119 100644 (file)
--- a/tools/perf/builtin-buildid-cache.c
+++ b/tools/perf/builtin-buildid-cache.c
@@ -174,19 +174,19 @@ static int build_id_cache__add_kcore(const char *filename, bool force)
 static int build_id_cache__add_file(const char *filename, struct nsinfo *nsi)
 {
        char sbuild_id[SBUILD_ID_SIZE];
-       u8 build_id[BUILD_ID_SIZE];
+       struct build_id bid;
        int err;
        struct nscookie nsc;
 
        nsinfo__mountns_enter(nsi, &nsc);
-       err = filename__read_build_id(filename, &build_id, sizeof(build_id));
+       err = filename__read_build_id(filename, &bid);
        nsinfo__mountns_exit(&nsc);
        if (err < 0) {
                pr_debug("Couldn't read a build-id in %s\n", filename);
                return -1;
        }
 
-       build_id__sprintf(build_id, sizeof(build_id), sbuild_id);
+       build_id__sprintf(&bid, sbuild_id);
        err = build_id_cache__add_s(sbuild_id, filename, nsi,
                                    false, false);
        pr_debug("Adding %s %s: %s\n", sbuild_id, filename,
@@ -196,21 +196,21 @@ static int build_id_cache__add_file(const char *filename, struct nsinfo *nsi)
 
 static int build_id_cache__remove_file(const char *filename, struct nsinfo *nsi)
 {
-       u8 build_id[BUILD_ID_SIZE];
        char sbuild_id[SBUILD_ID_SIZE];
+       struct build_id bid;
        struct nscookie nsc;
 
        int err;
 
        nsinfo__mountns_enter(nsi, &nsc);
-       err = filename__read_build_id(filename, &build_id, sizeof(build_id));
+       err = filename__read_build_id(filename, &bid);
        nsinfo__mountns_exit(&nsc);
        if (err < 0) {
                pr_debug("Couldn't read a build-id in %s\n", filename);
                return -1;
        }
 
-       build_id__sprintf(build_id, sizeof(build_id), sbuild_id);
+       build_id__sprintf(&bid, sbuild_id);
        err = build_id_cache__remove_s(sbuild_id);
        pr_debug("Removing %s %s: %s\n", sbuild_id, filename,
                 err ? "FAIL" : "Ok");
@@ -274,17 +274,16 @@ static int build_id_cache__purge_all(void)
 static bool dso__missing_buildid_cache(struct dso *dso, int parm __maybe_unused)
 {
        char filename[PATH_MAX];
-       u8 build_id[BUILD_ID_SIZE];
+       struct build_id bid;
 
        if (dso__build_id_filename(dso, filename, sizeof(filename), false) &&
-           filename__read_build_id(filename, build_id,
-                                   sizeof(build_id)) != sizeof(build_id)) {
+           filename__read_build_id(filename, &bid) == -1) {
                if (errno == ENOENT)
                        return false;
 
                pr_warning("Problems with %s file, consider removing it from the cache\n",
                           filename);
-       } else if (memcmp(dso->build_id, build_id, sizeof(dso->build_id))) {
+       } else if (memcmp(dso->bid.data, bid.data, bid.size)) {
                pr_warning("Problems with %s file, consider removing it from the cache\n",
                           filename);
        }
@@ -300,14 +299,14 @@ static int build_id_cache__fprintf_missing(struct perf_session *session, FILE *f
 
 static int build_id_cache__update_file(const char *filename, struct nsinfo *nsi)
 {
-       u8 build_id[BUILD_ID_SIZE];
        char sbuild_id[SBUILD_ID_SIZE];
+       struct build_id bid;
        struct nscookie nsc;
 
        int err;
 
        nsinfo__mountns_enter(nsi, &nsc);
-       err = filename__read_build_id(filename, &build_id, sizeof(build_id));
+       err = filename__read_build_id(filename, &bid);
        nsinfo__mountns_exit(&nsc);
        if (err < 0) {
                pr_debug("Couldn't read a build-id in %s\n", filename);
@@ -315,7 +314,7 @@ static int build_id_cache__update_file(const char *filename, struct nsinfo *nsi)
        }
        err = 0;
 
-       build_id__sprintf(build_id, sizeof(build_id), sbuild_id);
+       build_id__sprintf(&bid, sbuild_id);
        if (build_id_cache__cached(sbuild_id))
                err = build_id_cache__remove_s(sbuild_id);