perf_counter tools: fix vmlinux symbol generation breakage
PATCH 1/1 perf_counter tools: fix vmlinux symbol generation breakage
(resend.. wrong lkml address)
perf_counter tools: fix vmlinux symbol generation breakage.
vmlinux meets the criteria for symbol adjustment, which breaks vmlinux generated symbols. Fix this by exempting vmlinux. This is a bit fragile in that someone could change the kernel dso's name, but currently that name is also hardwired.
Signed-off-by Mike Galbraith <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Peter Zijlstra <[email protected]>
LKML-Reference: <new-submission>
--- tools/perf/util/symbol.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
tools/perf/util/symbol.c +5 -2
@@ -519,7 +519,7 @@ static int dso__load_sym(struct dso *selGElf_Sym sym;Elf_Scn *sec, *sec_strndx;Elf *elf; -int nr =0 ; +int nr =0 , kernel = !strcmp ("[kernel]" , self->name); elf =elf_begin (fd,ELF_C_READ_MMAP ,NULL );if (elf ==NULL ) {
@@ -565,10 +565,13 @@ static int dso__load_sym(struct dso *sel nr_syms = shdr.sh_size / shdr.sh_entsize;memset (&sym,0 ,sizeof (sym)); - self->adjust_symbols = (ehdr.e_type ==ET_EXEC || +if (!kernel) + self->adjust_symbols = (ehdr.e_type ==ET_EXEC ||elf_section_by_name (elf, &ehdr, &shdr,".gnu.prelink_undo" ,NULL ) !=NULL ); +else self->adjust_symbols =0 ; +elf_symtab__for_each_symbol (syms, nr_syms, index, sym) {struct symbol *f;u64 obj_start;