From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 4 Jan 2011 07:08:51 +0000 (+0100)
Subject: Merge commit 'v2.6.37-rc8' into perf/core
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cc2221969906a166a638aecdbae84a3d0462719e;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge commit 'v2.6.37-rc8' into perf/core

Merge reason: pick up latest -rc.

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

cc2221969906a166a638aecdbae84a3d0462719e
diff --cc tools/perf/builtin-buildid-list.c
index 3b06f9ca2638,c49837de7d3f..5af32ae9031e
--- a/tools/perf/builtin-buildid-list.c
+++ b/tools/perf/builtin-buildid-list.c
@@@ -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;
  
diff --cc tools/perf/util/symbol.c
index 2ea1a2e4c0c2,439ab947daf4..15ccfba8cdf8
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@@ -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;