mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-25 13:43:55 +08:00
perf/urgent fixes:
. Fix traceevent plugin path definitions (Josh Boyer) . Load map before using map->map_ip() (Masami Hiramatsu) Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.15 (GNU/Linux) iQIcBAABAgAGBQJS4W2eAAoJENZQFvNTUqpAMogP+QEhKobi9AiVr2aE9rysUbLA O4jXsFQzDZR75mJL87DLEXZ1eDwK3TtpzdQrDIFHy/rGpoyspxwZAR916FBRH/hL MMKvzTp7YeyY6x0Ip90ISvyK1qC1CrTSj3tnokAOISe8eLmYXXGSZNzAlwuHlE+Y TNGcZtJ2UjE3AHEL9OBfoja43k1Mq5oPi0juxgkHTGxmf7gVrM2maz3PHqJqd68W 0zGb9A5a9MHObNLoLnwrCAka2VurtJZl5I+PCaQ2dyoslQeXZ4veeM1EEwCK3Xs6 Eqr6ZqPhkSgFy78qkSUy2HCIlYYErbNPgrQhQb+Hleh6Q8/azlLWNG/7yBa3L5Ed BsNP6vD/touo/aJLCzWLnF9w/5AJN//g1pvkPhgsYyQV7oxEeV2VMcJNJ4Klq5aE MNOPeDIV4E3S1znIc5JwkrHX8O04aHI4eY7sSoKS1SPmcoqZ99ovqNjsfJLQ87BJ t8RUZRWNVVwrLkUdUOK6mRllXBm7Ui8ElKu0ckqUSqz4PEyL6DWAOLjhEeDLErqu RBJTi+oKf3KTAFCBVD/Tb/zcSGilBpU7Y5mpDaPHS4S5CeZaGyQegtBlLsvFxmla 6/NVghsRXCCYq6Nnc7HHSG7Vnx7/82yOx1Ue24JTJTVhBIsiU2MXVgwyiRWuc/8o Z8jXdvPZ4NzQAgfJe0lT =SxCe -----END PGP SIGNATURE----- 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: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
commit
993e5ee67a
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user