Merge commit 'v2.6.37-rc8' into perf/core
Merge reason: pick up latest -rc. Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
@@ -1822,8 +1822,8 @@ 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];
|
||||
|
Reference in New Issue
Block a user