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

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

perf symbols: Use __map__is_kernel() instead of ad-hoc equivalent code 

Shorter, should be equivalent code, use it.

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-q90olng8sfkvrnsrwu7xnul6@git.kernel.org


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

tools/perf/util/symbol.c

+1 −4
Original line number Diff line number Diff line
@@ -1163,7 +1163,6 @@ static int dso__load_kcore(struct dso *dso, struct map *map, 
			   const char *kallsyms_filename)

{

	struct map_groups *kmaps = map__kmaps(map);

	struct machine *machine;

	struct kcore_mapfn_data md;

	struct map *old_map, *new_map, *replacement_map = NULL;

	bool is_64_bit;
@@ -1174,10 +1173,8 @@ static int dso__load_kcore(struct dso *dso, struct map *map, 
	if (!kmaps)

		return -EINVAL;



	machine = kmaps->machine;



	/* This function requires that the map is the kernel map */

	if (map != machine->vmlinux_maps[map->type])

	if (!__map__is_kernel(map))

		return -EINVAL;



	if (!filename_from_kallsyms_filename(kcore_filename, "kcore",