Messages in this thread Patch in this message | | | Subject | [patch] perf_counter tools: fix vmlinux symbol generation breakage | From | Mike Galbraith <> | Date | Mon, 20 Jul 2009 14:01:38 +0200 |
| |
(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 <efault@gmx.de> Cc: Ingo Molnar <mingo@elte.hu> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> LKML-Reference: <new-submission>
--- tools/perf/util/symbol.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
Index: linux-2.6/tools/perf/util/symbol.c =================================================================== --- linux-2.6.orig/tools/perf/util/symbol.c +++ linux-2.6/tools/perf/util/symbol.c @@ -519,7 +519,7 @@ static int dso__load_sym(struct dso *sel GElf_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;
| |