These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / tools / perf / builtin-buildid-cache.c

diff --git a/kernel/tools/perf/builtin-buildid-cache.c b/kernel/tools/perf/builtin-buildid-cache.c
index d47a0cd..7b8450c 100644 (file)
--- a/kernel/tools/perf/builtin-buildid-cache.c
+++ b/kernel/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)
@@ -127,7 +117,7 @@ static int build_id_cache__kcore_existing(const char *from_dir, char *to_dir,
 
 static int build_id_cache__add_kcore(const char *filename, bool force)
 {
-       char dir[32], sbuildid[BUILD_ID_SIZE * 2 + 1];
+       char dir[32], sbuildid[SBUILD_ID_SIZE];
        char from_dir[PATH_MAX], to_dir[PATH_MAX];
        char *p;
 
@@ -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",
@@ -184,7 +174,7 @@ static int build_id_cache__add_kcore(const char *filename, bool force)
 
 static int build_id_cache__add_file(const char *filename)
 {
-       char sbuild_id[BUILD_ID_SIZE * 2 + 1];
+       char sbuild_id[SBUILD_ID_SIZE];
        u8 build_id[BUILD_ID_SIZE];
        int err;
 
@@ -204,7 +194,7 @@ static int build_id_cache__add_file(const char *filename)
 static int build_id_cache__remove_file(const char *filename)
 {
        u8 build_id[BUILD_ID_SIZE];
-       char sbuild_id[BUILD_ID_SIZE * 2 + 1];
+       char sbuild_id[SBUILD_ID_SIZE];
 
        int err;
 
@@ -276,7 +266,7 @@ static int build_id_cache__fprintf_missing(struct perf_session *session, FILE *f
 static int build_id_cache__update_file(const char *filename)
 {
        u8 build_id[BUILD_ID_SIZE];
-       char sbuild_id[BUILD_ID_SIZE * 2 + 1];
+       char sbuild_id[SBUILD_ID_SIZE];
 
        int err = 0;
 
@@ -363,7 +353,7 @@ int cmd_buildid_cache(int argc, const char **argv,
        setup_pager();
 
        if (add_name_list_str) {
-               list = strlist__new(true, add_name_list_str);
+               list = strlist__new(add_name_list_str, NULL);
                if (list) {
                        strlist__for_each(pos, list)
                                if (build_id_cache__add_file(pos->s)) {
@@ -381,7 +371,7 @@ int cmd_buildid_cache(int argc, const char **argv,
        }
 
        if (remove_name_list_str) {
-               list = strlist__new(true, remove_name_list_str);
+               list = strlist__new(remove_name_list_str, NULL);
                if (list) {
                        strlist__for_each(pos, list)
                                if (build_id_cache__remove_file(pos->s)) {
@@ -399,7 +389,7 @@ int cmd_buildid_cache(int argc, const char **argv,
        }
 
        if (purge_name_list_str) {
-               list = strlist__new(true, purge_name_list_str);
+               list = strlist__new(purge_name_list_str, NULL);
                if (list) {
                        strlist__for_each(pos, list)
                                if (build_id_cache__purge_path(pos->s)) {
@@ -420,7 +410,7 @@ int cmd_buildid_cache(int argc, const char **argv,
                ret = build_id_cache__fprintf_missing(session, stdout);
 
        if (update_name_list_str) {
-               list = strlist__new(true, update_name_list_str);
+               list = strlist__new(update_name_list_str, NULL);
                if (list) {
                        strlist__for_each(pos, list)
                                if (build_id_cache__update_file(pos->s)) {