Merge tag 'v4.19-rc5' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
@@ -574,6 +574,13 @@ struct symbol *map_groups__find_symbol(struct map_groups *mg,
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static bool map__contains_symbol(struct map *map, struct symbol *sym)
|
||||
{
|
||||
u64 ip = map->unmap_ip(map, sym->start);
|
||||
|
||||
return ip >= map->start && ip < map->end;
|
||||
}
|
||||
|
||||
struct symbol *maps__find_symbol_by_name(struct maps *maps, const char *name,
|
||||
struct map **mapp)
|
||||
{
|
||||
@@ -589,6 +596,10 @@ struct symbol *maps__find_symbol_by_name(struct maps *maps, const char *name,
|
||||
|
||||
if (sym == NULL)
|
||||
continue;
|
||||
if (!map__contains_symbol(pos, sym)) {
|
||||
sym = NULL;
|
||||
continue;
|
||||
}
|
||||
if (mapp != NULL)
|
||||
*mapp = pos;
|
||||
goto out;
|
||||
|
Reference in New Issue
Block a user