diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-11-04 11:54:15 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-11-04 11:59:45 +0100 |
| commit | a2e71271535fde493c32803b1f34789f97efcb5e (patch) | |
| tree | 90d7139bea2f49e947f27af92614fa6eca50b64d /tools/perf/util/symbol.c | |
| parent | perf symbols: Initialize dso->loaded (diff) | |
| parent | Linux 2.6.32-rc6 (diff) | |
| download | linux-dev-a2e71271535fde493c32803b1f34789f97efcb5e.tar.xz linux-dev-a2e71271535fde493c32803b1f34789f97efcb5e.zip | |
Merge commit 'v2.6.32-rc6' into perf/core
Conflicts:
tools/perf/Makefile
Merge reason: Resolve the conflict, merge to upstream and merge in
perf fixes so we can add a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/util/symbol.c')
| -rw-r--r-- | tools/perf/util/symbol.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index 93c49f4685ff..ac94d7b94f61 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -549,7 +549,7 @@ static int dso__synthesize_plt_symbols(struct dso *self) if (fd < 0) goto out; - elf = elf_begin(fd, ELF_C_READ_MMAP, NULL); + elf = elf_begin(fd, PERF_ELF_C_READ_MMAP, NULL); if (elf == NULL) goto out_close; @@ -673,7 +673,7 @@ static int dso__load_sym(struct dso *self, struct map *map, const char *name, Elf *elf; int nr = 0; - elf = elf_begin(fd, ELF_C_READ_MMAP, NULL); + elf = elf_begin(fd, PERF_ELF_C_READ_MMAP, NULL); if (elf == NULL) { pr_err("%s: cannot read %s ELF file.\n", __func__, name); goto out_close; @@ -842,7 +842,7 @@ static char *dso__read_build_id(struct dso *self) if (fd < 0) goto out; - elf = elf_begin(fd, ELF_C_READ_MMAP, NULL); + elf = elf_begin(fd, PERF_ELF_C_READ_MMAP, NULL); if (elf == NULL) { pr_err("%s: cannot read %s ELF file.\n", __func__, self->long_name); |