Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 205343
b: refs/heads/master
c: 8b1389e
h: refs/heads/master
i:
  205341: 78d2c7c
  205339: 4d4ad11
  205335: 6ec1ed7
  205327: ceb8070
  205311: 091e55a
v: v3
  • Loading branch information
Dave Martin authored and Arnaldo Carvalho de Melo committed Jul 30, 2010
1 parent 1a5a03c commit f5d5512
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 27 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 21916c380d93ab59d6d07ee198fb31c8f1338e26
refs/heads/master: 8b1389ef93b36621c6acdeb623bd85aee3c405c9
28 changes: 2 additions & 26 deletions trunk/tools/perf/util/symbol.c
Original file line number Diff line number Diff line change
Expand Up @@ -986,12 +986,12 @@ static int dso__load_sym(struct dso *self, struct map *map, const char *name,

elf = elf_begin(fd, PERF_ELF_C_READ_MMAP, NULL);
if (elf == NULL) {
pr_err("%s: cannot read %s ELF file.\n", __func__, name);
pr_debug("%s: cannot read %s ELF file.\n", __func__, name);
goto out_close;
}

if (gelf_getehdr(elf, &ehdr) == NULL) {
pr_err("%s: cannot get elf header.\n", __func__);
pr_debug("%s: cannot get elf header.\n", __func__);
goto out_elf_end;
}

Expand Down Expand Up @@ -1710,30 +1710,6 @@ static int dso__load_vmlinux(struct dso *self, struct map *map,
{
int err = -1, fd;

if (self->has_build_id) {
u8 build_id[BUILD_ID_SIZE];

if (filename__read_build_id(vmlinux, build_id,
sizeof(build_id)) < 0) {
pr_debug("No build_id in %s, ignoring it\n", vmlinux);
return -1;
}
if (!dso__build_id_equal(self, build_id)) {
char expected_build_id[BUILD_ID_SIZE * 2 + 1],
vmlinux_build_id[BUILD_ID_SIZE * 2 + 1];

build_id__sprintf(self->build_id,
sizeof(self->build_id),
expected_build_id);
build_id__sprintf(build_id, sizeof(build_id),
vmlinux_build_id);
pr_debug("build_id in %s is %s while expected is %s, "
"ignoring it\n", vmlinux, vmlinux_build_id,
expected_build_id);
return -1;
}
}

fd = open(vmlinux, O_RDONLY);
if (fd < 0)
return -1;
Expand Down

0 comments on commit f5d5512

Please sign in to comment.