diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-04-26 09:49:31 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-04-26 13:47:18 -0300 |
| commit | e1f2a0d0f2d80c7fedb5f910367bc12d02e914a7 (patch) | |
| tree | 9314e6c8d5f870bb01f1a22e9ea2b3e6810d91d4 /tools | |
| parent | 404eb5a436c4cbdc3b76896a28a3b72b7ad9294e (diff) | |
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: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/arch/arm/tests/dwarf-unwind.c | 2 | ||||
| -rw-r--r-- | tools/perf/arch/arm64/tests/dwarf-unwind.c | 2 | ||||
| -rw-r--r-- | tools/perf/arch/powerpc/tests/dwarf-unwind.c | 2 | ||||
| -rw-r--r-- | tools/perf/arch/x86/tests/dwarf-unwind.c | 2 | ||||
| -rw-r--r-- | tools/perf/util/map.h | 3 |
5 files changed, 6 insertions, 5 deletions
diff --git a/tools/perf/arch/arm/tests/dwarf-unwind.c b/tools/perf/arch/arm/tests/dwarf-unwind.c index 7d7a65ca2e8d..9a0242e74cfc 100644 --- a/tools/perf/arch/arm/tests/dwarf-unwind.c +++ b/tools/perf/arch/arm/tests/dwarf-unwind.c @@ -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); diff --git a/tools/perf/arch/arm64/tests/dwarf-unwind.c b/tools/perf/arch/arm64/tests/dwarf-unwind.c index f053eae3b6eb..5522ce384723 100644 --- a/tools/perf/arch/arm64/tests/dwarf-unwind.c +++ b/tools/perf/arch/arm64/tests/dwarf-unwind.c @@ -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); diff --git a/tools/perf/arch/powerpc/tests/dwarf-unwind.c b/tools/perf/arch/powerpc/tests/dwarf-unwind.c index b22d643cb602..5f39efef0856 100644 --- a/tools/perf/arch/powerpc/tests/dwarf-unwind.c +++ b/tools/perf/arch/powerpc/tests/dwarf-unwind.c @@ -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); diff --git a/tools/perf/arch/x86/tests/dwarf-unwind.c b/tools/perf/arch/x86/tests/dwarf-unwind.c index 7da845026323..7879df34569a 100644 --- a/tools/perf/arch/x86/tests/dwarf-unwind.c +++ b/tools/perf/arch/x86/tests/dwarf-unwind.c @@ -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); diff --git a/tools/perf/util/map.h b/tools/perf/util/map.h index 579ad7d2711d..d035d8f0d5b2 100644 --- a/tools/perf/util/map.h +++ b/tools/perf/util/map.h @@ -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); |