4 files changed, 7 insertions, 10 deletions

diff --git a/tools/perf/util/Build b/tools/perf/util/Build
index 601d11440596..d2d318c59b37 100644
--- a/tools/perf/util/Build
+++ b/tools/perf/util/Build
@@ -143,6 +143,6 @@ $(OUTPUT)util/rbtree.o: ../lib/rbtree.c FORCE
         $(call rule_mkdir)
         $(call if_changed_dep,cc_o_c)
 
-$(OUTPUT)util/hweight.o: ../../lib/hweight.c FORCE
+$(OUTPUT)util/hweight.o: ../lib/hweight.c FORCE
         $(call rule_mkdir)
         $(call if_changed_dep,cc_o_c)
diff --git a/tools/perf/util/python-ext-sources b/tools/perf/util/python-ext-sources
index e23ded40c79e..0766d98c5da5 100644
--- a/tools/perf/util/python-ext-sources
+++ b/tools/perf/util/python-ext-sources
@@ -10,7 +10,7 @@ util/ctype.c
 util/evlist.c
 util/evsel.c
 util/cpumap.c
-../../lib/hweight.c
+../lib/hweight.c
 util/thread_map.c
 util/util.c
 util/xyarray.c
@@ -19,5 +19,5 @@ util/rblist.c
 util/stat.c
 util/strlist.c
 util/trace-event.c
-../../lib/rbtree.c
+../lib/rbtree.c
 util/string.c
diff --git a/tools/perf/util/thread_map.c b/tools/perf/util/thread_map.c
index da7646d767fe..292ae2c90e06 100644
--- a/tools/perf/util/thread_map.c
+++ b/tools/perf/util/thread_map.c
@@ -136,8 +136,7 @@ struct thread_map *thread_map__new_by_uid(uid_t uid)
                 if (grow) {
                         struct thread_map *tmp;
 
-                        tmp = realloc(threads, (sizeof(*threads) +
-                                                max_threads * sizeof(pid_t)));
+                        tmp = thread_map__realloc(threads, max_threads);
                         if (tmp == NULL)
                                 goto out_free_namelist;
 
diff --git a/tools/perf/util/vdso.c b/tools/perf/util/vdso.c
index 4b89118f158d..44d440da15dc 100644
--- a/tools/perf/util/vdso.c
+++ b/tools/perf/util/vdso.c
@@ -236,18 +236,16 @@ static struct dso *__machine__findnew_compat(struct machine *machine,
         const char *file_name;
         struct dso *dso;
 
-        pthread_rwlock_wrlock(&machine->dsos.lock);
         dso = __dsos__find(&machine->dsos, vdso_file->dso_name, true);
         if (dso)
-                goto out_unlock;
+                goto out;
 
         file_name = vdso__get_compat_file(vdso_file);
         if (!file_name)
-                goto out_unlock;
+                goto out;
 
         dso = __machine__addnew_vdso(machine, vdso_file->dso_name, file_name);
-out_unlock:
-        pthread_rwlock_unlock(&machine->dsos.lock);
+out:
         return dso;
 }