diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-01-04 02:08:51 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-01-04 02:08:54 -0500 |
| commit | cc2221969906a166a638aecdbae84a3d0462719e (patch) | |
| tree | 2483f726e226c309207e1d0250660eea6e1787b8 /tools/perf/util/symbol.c | |
| parent | 56f4c400349157289b474a3fd49ee96acab0a4d7 (diff) | |
| parent | 387c31c7e5c9805b0aef8833d1731a5fe7bdea14 (diff) | |
Merge commit 'v2.6.37-rc8' into perf/core
Merge reason: pick up latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/util/symbol.c')
| -rw-r--r-- | tools/perf/util/symbol.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index 2ea1a2e4c0c2..15ccfba8cdf8 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c | |||
| @@ -1822,8 +1822,8 @@ out_failure: | |||
| 1822 | return -1; | 1822 | return -1; |
| 1823 | } | 1823 | } |
| 1824 | 1824 | ||
| 1825 | static int dso__load_vmlinux(struct dso *self, struct map *map, | 1825 | int dso__load_vmlinux(struct dso *self, struct map *map, |
| 1826 | const char *vmlinux, symbol_filter_t filter) | 1826 | const char *vmlinux, symbol_filter_t filter) |
| 1827 | { | 1827 | { |
| 1828 | int err = -1, fd; | 1828 | int err = -1, fd; |
| 1829 | char symfs_vmlinux[PATH_MAX]; | 1829 | char symfs_vmlinux[PATH_MAX]; |