diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2014-02-14 11:11:18 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-02-14 11:11:18 -0800 |
| commit | 31fce91e7afc25c666276f65f019bc13fd27e216 (patch) | |
| tree | 24f9673614a98a06fd8f4254c63b306dddd5aac6 /tools/perf/util/map.c | |
| parent | 4640c7ee9b8953237d05a61ea3ea93981d1bc961 (diff) | |
| parent | 09503379dc99535b1bbfa51aa1aeef340f5d82ec (diff) | |
| download | op-kernel-dev-31fce91e7afc25c666276f65f019bc13fd27e216.zip op-kernel-dev-31fce91e7afc25c666276f65f019bc13fd27e216.tar.gz | |
Merge remote-tracking branch 'efi/urgent' into x86/urgent
There have been reports of EFI crashes since -rc1. The following two
commits fix known issues.
* Fix boot failure on 32-bit EFI due to the recent EFI memmap changes
merged during the merge window - Borislav Petkov
* Avoid a crash during efi_bgrt_init() by detecting invalid BGRT
headers based on the 'status' field.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'tools/perf/util/map.c')
| -rw-r--r-- | tools/perf/util/map.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c index 3b97513..39cd2d0 100644 --- a/tools/perf/util/map.c +++ b/tools/perf/util/map.c @@ -39,6 +39,7 @@ void map__init(struct map *map, enum map_type type, map->start = start; map->end = end; map->pgoff = pgoff; + map->reloc = 0; map->dso = dso; map->map_ip = map__map_ip; map->unmap_ip = map__unmap_ip; @@ -288,7 +289,7 @@ u64 map__rip_2objdump(struct map *map, u64 rip) if (map->dso->rel) return rip - map->pgoff; - return map->unmap_ip(map, rip); + return map->unmap_ip(map, rip) - map->reloc; } /** @@ -311,7 +312,7 @@ u64 map__objdump_2mem(struct map *map, u64 ip) if (map->dso->rel) return map->unmap_ip(map, ip + map->pgoff); - return ip; + return ip + map->reloc; } void map_groups__init(struct map_groups *mg) |
