From: Arnaldo Carvalho de Melo acme@redhat.com
commit 9bac1bd6e6d36459087a728a968e79e37ebcea1a 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 2d6b74baa7147251c30a46c4996e8cc224aa2dc5.
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 --- tools/perf/util/map.c | 2 -- 1 file changed, 2 deletions(-)
--- a/tools/perf/util/map.c +++ b/tools/perf/util/map.c @@ -216,8 +216,6 @@ struct map *map__new(struct machine *mac if (type != MAP__FUNCTION) dso__set_loaded(dso, map->type); } - - nsinfo__put(dso->nsinfo); dso->nsinfo = nsi; dso__put(dso); }