Skip to content

Commit

Permalink
Revert "perf map: Fix dso->nsinfo refcounting"
Browse files Browse the repository at this point in the history
commit 9bac1bd upstream.

This makes 'perf top' abort in some cases, and the right fix will
involve surgery that is too much to do at this stage, so revert for now
and fix it in the next merge window.

This reverts commit 2d6b74b.

Cc: Riccardo Mancini <rickyman7@gmail.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Krister Johansen <kjlx@templeofstupid.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
acmel authored and gregkh committed Aug 4, 2021
1 parent c14cee5 commit 2ca5ec1
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions tools/perf/util/map.c
Expand Up @@ -192,8 +192,6 @@ struct map *map__new(struct machine *machine, u64 start, u64 len,
if (!(prot & PROT_EXEC))
dso__set_loaded(dso);
}

nsinfo__put(dso->nsinfo);
dso->nsinfo = nsi;
dso__put(dso);
}
Expand Down

0 comments on commit 2ca5ec1

Please sign in to comment.