“1da177e4c3f41524e886b7f1b8a0c1fc7321cac2”上不存在“include/drm/drm_memory_debug.h”
提交 e47a6c3c 编写于 作者: A Arnaldo Carvalho de Melo 提交者: Yang Yingliang

Revert "perf map: Fix dso->nsinfo refcounting"

stable inclusion
from linux-4.19.201
commit 265c33f7417646cf6a48327e2fdabf49d3262cd3

--------------------------------

commit 9bac1bd6 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 2d6b74ba.

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: NArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 a4486444
...@@ -209,8 +209,6 @@ struct map *map__new(struct machine *machine, u64 start, u64 len, ...@@ -209,8 +209,6 @@ struct map *map__new(struct machine *machine, u64 start, u64 len,
if (!(prot & PROT_EXEC)) if (!(prot & PROT_EXEC))
dso__set_loaded(dso); dso__set_loaded(dso);
} }
nsinfo__put(dso->nsinfo);
dso->nsinfo = nsi; dso->nsinfo = nsi;
dso__put(dso); dso__put(dso);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册