diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2020-02-05 08:44:40 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-02-05 08:44:40 +0100 |
| commit | 45f035748b2aa29840fec6ba01cd8e44c63034c2 (patch) | |
| tree | b590cf3a264f6d7c20665898493f7ac2ef8623c0 /tools/perf/util/map.c | |
| parent | Merge branch 'linus' into perf/urgent, to synchronize with upstream (diff) | |
| parent | perf maps: Add missing unlock to maps__insert() error case (diff) | |
| download | linux-dev-45f035748b2aa29840fec6ba01cd8e44c63034c2.tar.xz linux-dev-45f035748b2aa29840fec6ba01cd8e44c63034c2.zip | |
Merge tag 'perf-core-for-mingo-5.6-20200201' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
perf maps:
Cengiz Can:
- Add missing unlock to maps__insert() error case.
srcline:
Changbin Du:
- Make perf able to build with latest libbfd.
perf parse:
Leo Yan:
- Keep copy of string in perf_evsel_config_term() to fix sink terms
processing in ARM CoreSight.
perf test:
Thomas Richter:
- Fix test case Merge cpu map, removing extra reference count drop that
causes a segfault on s/390.
perf probe:
Thomas Richter:
- Add ustring support for perf probe command
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/map.c')
| -rw-r--r-- | tools/perf/util/map.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c index fdd5bddb3075..f67960bedebb 100644 --- a/tools/perf/util/map.c +++ b/tools/perf/util/map.c @@ -549,6 +549,7 @@ void maps__insert(struct maps *maps, struct map *map) if (maps_by_name == NULL) { __maps__free_maps_by_name(maps); + up_write(&maps->lock); return; } |