Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

[firefly-linux-kernel-4.4.55.git] / tools / perf / util / symbol-elf.c

diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c
index 65f7e389ae0996cae131cbfbcd2196181f15f1e7..53bb5f59ec589c22f7b1cd211cb132a3ca98d702 100644 (file)
--- a/tools/perf/util/symbol-elf.c
+++ b/tools/perf/util/symbol-elf.c
@@ -38,7 +38,7 @@ static inline char *bfd_demangle(void __maybe_unused *v,
 #endif
 
 #ifndef HAVE_ELF_GETPHDRNUM_SUPPORT
-static int elf_getphdrnum(Elf *elf, size_t *dst)
+int elf_getphdrnum(Elf *elf, size_t *dst)
 {
        GElf_Ehdr gehdr;
        GElf_Ehdr *ehdr;
@@ -875,6 +875,17 @@ int dso__load_sym(struct dso *dso, struct map *map,
                }
        }
 
+       /*
+        * Handle any relocation of vdso necessary because older kernels
+        * attempted to prelink vdso to its virtual address.
+        */
+       if (dso__is_vdso(dso)) {
+               GElf_Shdr tshdr;
+
+               if (elf_section_by_name(elf, &ehdr, &tshdr, ".text", NULL))
+                       map->reloc = map->start - tshdr.sh_addr + tshdr.sh_offset;
+       }
+
        dso->adjust_symbols = runtime_ss->adjust_symbols || ref_reloc(kmap);
        /*
         * Initial kernel and module mappings do not map to the dso.  For