diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-06 04:27:34 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-06 04:27:34 -0500 |
| commit | 1928e87bcf185f56008d0746f887b691c1cb8c4a (patch) | |
| tree | bc8db9e9cb40b73742d05e2e68189bd647687249 /tools/perf/util/symbol.c | |
| parent | ca9c20ce2b383032b71bdae9ec0b468d428ca8d4 (diff) | |
| parent | 3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/video/sh_mobile_lcdcfb.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
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 d628c8d1cf5e..439ab947daf4 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c | |||
| @@ -1780,8 +1780,8 @@ out_failure: | |||
| 1780 | return -1; | 1780 | return -1; |
| 1781 | } | 1781 | } |
| 1782 | 1782 | ||
| 1783 | static int dso__load_vmlinux(struct dso *self, struct map *map, | 1783 | int dso__load_vmlinux(struct dso *self, struct map *map, |
| 1784 | const char *vmlinux, symbol_filter_t filter) | 1784 | const char *vmlinux, symbol_filter_t filter) |
| 1785 | { | 1785 | { |
| 1786 | int err = -1, fd; | 1786 | int err = -1, fd; |
| 1787 | 1787 | ||