Merge commit 'v2.6.32-rc6' into perf/core
Ingo Molnar [Wed, 4 Nov 2009 10:54:15 +0000 (11:54 +0100)]
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>

1  2 
include/linux/perf_event.h
kernel/perf_event.c
kernel/trace/ftrace.c
kernel/trace/ring_buffer.c
kernel/trace/trace.c
tools/perf/Makefile
tools/perf/util/symbol.c
tools/perf/util/symbol.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -671,11 -531,13 +671,11 @@@ static int dso__load_sym(struct dso *se
        GElf_Sym sym;
        Elf_Scn *sec, *sec_strndx;
        Elf *elf;
 -      int nr = 0, kernel = !strcmp("[kernel]", self->name);
 +      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) {
 -              if (v)
 -                      fprintf(stderr, "%s: cannot read %s ELF file.\n",
 -                              __func__, name);
 +              pr_err("%s: cannot read %s ELF file.\n", __func__, name);
                goto out_close;
        }
  
@@@ -842,10 -675,11 +842,10 @@@ static char *dso__read_build_id(struct 
        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) {
 -              if (v)
 -                      fprintf(stderr, "%s: cannot read %s ELF file.\n",
 -                              __func__, self->name);
 +              pr_err("%s: cannot read %s ELF file.\n", __func__,
 +                     self->long_name);
                goto out_close;
        }
  
Simple merge