Merge commit 'v2.6.37-rc8' into perf/core
Ingo Molnar [Tue, 4 Jan 2011 07:08:51 +0000 (08:08 +0100)]
Merge reason: pick up latest -rc.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1  2 
MAINTAINERS
tools/perf/builtin-buildid-list.c
tools/perf/util/header.c
tools/perf/util/probe-event.c
tools/perf/util/probe-finder.c
tools/perf/util/symbol.c
tools/perf/util/symbol.h

diff --cc MAINTAINERS
Simple merge
@@@ -36,11 -36,9 +36,10 @@@ static const struct option options[] = 
  
  static int __cmd_buildid_list(void)
  {
-       int err = -1;
        struct perf_session *session;
  
 -      session = perf_session__new(input_name, O_RDONLY, force, false);
 +      session = perf_session__new(input_name, O_RDONLY, force, false,
 +                                  &build_id__mark_dso_hit_ops);
        if (session == NULL)
                return -1;
  
Simple merge
Simple merge
Simple merge
@@@ -1822,15 -1780,12 +1822,15 @@@ out_failure
        return -1;
  }
  
- static int dso__load_vmlinux(struct dso *self, struct map *map,
-                            const char *vmlinux, symbol_filter_t filter)
+ int dso__load_vmlinux(struct dso *self, struct map *map,
+                     const char *vmlinux, symbol_filter_t filter)
  {
        int err = -1, fd;
 +      char symfs_vmlinux[PATH_MAX];
  
 -      fd = open(vmlinux, O_RDONLY);
 +      snprintf(symfs_vmlinux, sizeof(symfs_vmlinux), "%s/%s",
 +               symbol_conf.symfs, vmlinux);
 +      fd = open(symfs_vmlinux, O_RDONLY);
        if (fd < 0)
                return -1;
  
Simple merge