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

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

perf map: Remove map_type arg from map_groups__find() 

One more step in ditching the split.

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


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

tools/perf/arch/arm/tests/dwarf-unwind.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ static int sample_ustack(struct perf_sample *sample, 


	sp = (unsigned long) regs[PERF_REG_ARM_SP];



	map = __map_groups__find(thread->mg, MAP__VARIABLE, (u64) sp);

	map = map_groups__find(thread->mg, (u64)sp);

	if (!map) {

		pr_debug("failed to get stack map\n");

		free(buf);

tools/perf/arch/arm64/tests/dwarf-unwind.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ static int sample_ustack(struct perf_sample *sample, 


	sp = (unsigned long) regs[PERF_REG_ARM64_SP];



	map = __map_groups__find(thread->mg, MAP__VARIABLE, (u64) sp);

	map = map_groups__find(thread->mg, (u64)sp);

	if (!map) {

		pr_debug("failed to get stack map\n");

		free(buf);

tools/perf/arch/powerpc/tests/dwarf-unwind.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ static int sample_ustack(struct perf_sample *sample, 


	sp = (unsigned long) regs[PERF_REG_POWERPC_R1];



	map = __map_groups__find(thread->mg, MAP__VARIABLE, (u64) sp);

	map = map_groups__find(thread->mg, (u64)sp);

	if (!map) {

		pr_debug("failed to get stack map\n");

		free(buf);

tools/perf/arch/x86/tests/dwarf-unwind.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ static int sample_ustack(struct perf_sample *sample, 


	sp = (unsigned long) regs[PERF_REG_X86_SP];



	map = __map_groups__find(thread->mg, MAP__VARIABLE, (u64) sp);

	map = map_groups__find(thread->mg, (u64)sp);

	if (!map) {

		pr_debug("failed to get stack map\n");

		free(buf);

tools/perf/util/map.h

+2 −1
Original line number Diff line number Diff line
@@ -222,7 +222,8 @@ static inline struct map *__map_groups__find(struct map_groups *mg, 


static inline struct map *map_groups__find(struct map_groups *mg, u64 addr)

{

	return __map_groups__find(mg, MAP__FUNCTION, addr);

	struct map *map = __map_groups__find(mg, MAP__FUNCTION, addr);

	return map ?: __map_groups__find(mg, MAP__VARIABLE, addr);

}



struct map *map_groups__first(struct map_groups *mg);