Commit 993e5ee6 authored by Ingo Molnar's avatar Ingo Molnar

Merge tag 'perf-urgent-for-mingo' of...

Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

  * Fix traceevent plugin path definitions (Josh Boyer)

  * Load map before using map->map_ip() (Masami Hiramatsu)
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents bb236de5 4afc81cd
...@@ -63,7 +63,7 @@ endif ...@@ -63,7 +63,7 @@ endif
endif endif
ifeq ($(set_plugin_dir),1) ifeq ($(set_plugin_dir),1)
PLUGIN_DIR = -DPLUGIN_DIR="$(DESTDIR)/$(plugin_dir)" PLUGIN_DIR = -DPLUGIN_DIR="$(plugin_dir)"
PLUGIN_DIR_SQ = '$(subst ','\'',$(PLUGIN_DIR))' PLUGIN_DIR_SQ = '$(subst ','\'',$(PLUGIN_DIR))'
endif endif
......
...@@ -600,5 +600,5 @@ perfexec_instdir_SQ = $(subst ','\'',$(perfexec_instdir)) ...@@ -600,5 +600,5 @@ perfexec_instdir_SQ = $(subst ','\'',$(perfexec_instdir))
# Otherwise we install plugins into the global $(libdir). # Otherwise we install plugins into the global $(libdir).
ifdef DESTDIR ifdef DESTDIR
plugindir=$(libdir)/traceevent/plugins plugindir=$(libdir)/traceevent/plugins
plugindir_SQ= $(subst ','\'',$(prefix)/$(plugindir)) plugindir_SQ= $(subst ','\'',$(plugindir))
endif endif
...@@ -386,7 +386,8 @@ struct symbol *map_groups__find_symbol(struct map_groups *mg, ...@@ -386,7 +386,8 @@ struct symbol *map_groups__find_symbol(struct map_groups *mg,
{ {
struct map *map = map_groups__find(mg, type, addr); struct map *map = map_groups__find(mg, type, addr);
if (map != NULL) { /* Ensure map is loaded before using map->map_ip */
if (map != NULL && map__load(map, filter) >= 0) {
if (mapp != NULL) if (mapp != NULL)
*mapp = map; *mapp = map;
return map__find_symbol(map, map->map_ip(map, addr), filter); return map__find_symbol(map, map->map_ip(map, addr), filter);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment