Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d183b261 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf map: Use map->prot in place of type==MAP__FUNCTION 

Equivalent, one step more in ditching enum map_type.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-mrjjc87a4tpf896j5u4sql4e@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 18231d79

tools/perf/util/map.c

+2 −2
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ struct map *map__new(struct machine *machine, u64 start, u64 len, 
		map->flags = flags;

		nsi = nsinfo__get(thread->nsinfo);



		if ((anon || no_dso) && nsi && type == MAP__FUNCTION) {

		if ((anon || no_dso) && nsi && (prot & PROT_EXEC)) {

			snprintf(newfilename, sizeof(newfilename),

				 "/tmp/perf-%d.map", nsi->pid);

			filename = newfilename;
@@ -213,7 +213,7 @@ struct map *map__new(struct machine *machine, u64 start, u64 len, 
			 * functions still return NULL, and we avoid the

			 * unnecessary map__load warning.

			 */

			if (type != MAP__FUNCTION)

			if (!(prot & PROT_EXEC))

				dso__set_loaded(dso, map->type);

		}

		dso->nsinfo = nsi;