perf tests: Fix task exit test setting maps

[firefly-linux-kernel-4.4.55.git] / tools / perf / builtin-buildid-cache.c

diff --git a/tools/perf/builtin-buildid-cache.c b/tools/perf/builtin-buildid-cache.c
index 65b4835309c7c0a1d7fe69701821d306e0249469..7b8450cd33c23ec7884a526fcb4fd3bec6ba6e8c 100644 (file)
--- a/tools/perf/builtin-buildid-cache.c
+++ b/tools/perf/builtin-buildid-cache.c
@@ -25,8 +25,6 @@
 static int build_id_cache__kcore_buildid(const char *proc_dir, char *sbuildid)
 {
        char root_dir[PATH_MAX];
-       char notes[PATH_MAX];
-       u8 build_id[BUILD_ID_SIZE];
        char *p;
 
        strlcpy(root_dir, proc_dir, sizeof(root_dir));
@@ -35,15 +33,7 @@ static int build_id_cache__kcore_buildid(const char *proc_dir, char *sbuildid)
        if (!p)
                return -1;
        *p = '\0';
-
-       scnprintf(notes, sizeof(notes), "%s/sys/kernel/notes", root_dir);
-
-       if (sysfs__read_build_id(notes, build_id, sizeof(build_id)))
-               return -1;
-
-       build_id__sprintf(build_id, sizeof(build_id), sbuildid);
-
-       return 0;
+       return sysfs__sprintf_build_id(root_dir, sbuildid);
 }
 
 static int build_id_cache__kcore_dir(char *dir, size_t sz)
@@ -138,7 +128,7 @@ static int build_id_cache__add_kcore(const char *filename, bool force)
                return -1;
        *p = '\0';
 
-       if (build_id_cache__kcore_buildid(from_dir, sbuildid))
+       if (build_id_cache__kcore_buildid(from_dir, sbuildid) < 0)
                return -1;
 
        scnprintf(to_dir, sizeof(to_dir), "%s/[kernel.kcore]/%s",