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

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

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

tools/lib/traceevent/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ endif 
endif



ifeq ($(set_plugin_dir),1)

PLUGIN_DIR = -DPLUGIN_DIR="$(DESTDIR)/$(plugin_dir)"

PLUGIN_DIR = -DPLUGIN_DIR="$(plugin_dir)"

PLUGIN_DIR_SQ = '$(subst ','\'',$(PLUGIN_DIR))'

endif

tools/perf/config/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -600,5 +600,5 @@ perfexec_instdir_SQ = $(subst ','\'',$(perfexec_instdir)) 
# Otherwise we install plugins into the global $(libdir).

ifdef DESTDIR

plugindir=$(libdir)/traceevent/plugins

plugindir_SQ= $(subst ','\'',$(prefix)/$(plugindir))

plugindir_SQ= $(subst ','\'',$(plugindir))

endif

tools/perf/util/map.c

+2 −1
Original line number Diff line number Diff line
@@ -386,7 +386,8 @@ struct symbol *map_groups__find_symbol(struct map_groups *mg, 
{

	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)

			*mapp = map;

		return map__find_symbol(map, map->map_ip(map, addr), filter);