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

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

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

Its equivalent, one less use of 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-6m18iv1ty7nh7kxlfmn89sgz@git.kernel.org


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

tools/perf/util/symbol.c

+3 −2
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <stdio.h>

#include <string.h>

#include <linux/kernel.h>

#include <linux/mman.h>

#include <sys/types.h>

#include <sys/stat.h>

#include <sys/param.h>
@@ -1217,7 +1218,7 @@ static int dso__load_kcore(struct dso *dso, struct map *map, 
	}



	/* Read new maps into temporary lists */

	err = file__read_maps(fd, md.type == MAP__FUNCTION, kcore_mapfn, &md,

	err = file__read_maps(fd, map->prot & PROT_EXEC, kcore_mapfn, &md,

			      &is_64_bit);

	if (err)

		goto out_err;
@@ -1285,7 +1286,7 @@ static int dso__load_kcore(struct dso *dso, struct map *map, 


	close(fd);



	if (map->type == MAP__FUNCTION)

	if (map->prot & PROT_EXEC)

		pr_debug("Using %s for kernel object code\n", kcore_filename);

	else

		pr_debug("Using %s for kernel data\n", kcore_filename);