diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2009-11-27 16:29:15 -0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-11-27 20:21:58 +0100 |
| commit | 605ca4ba017455d39ac6991c58eb1e80fb8af48d (patch) | |
| tree | c037d9c0cecf549bafa131e9520a28c9d2d9dee0 | |
| parent | b0da954a4759ac19fb80a959e53b613fe376bc12 (diff) | |
| download | linux-605ca4ba017455d39ac6991c58eb1e80fb8af48d.tar.bz2 | |
perf symbols: Unexport kernel_map__functions
perf annotate was the only user, and it doesn't really need it.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1259346563-12568-4-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | tools/perf/builtin-annotate.c | 8 | ||||
| -rw-r--r-- | tools/perf/util/symbol.c | 3 | ||||
| -rw-r--r-- | tools/perf/util/symbol.h | 1 |
3 files changed, 4 insertions, 8 deletions
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index 377cb7c9bdda..0846c8a155ed 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c @@ -169,7 +169,6 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head) level = '.'; map = thread__find_map(thread, ip); if (map != NULL) { -got_map: ip = map->map_ip(map, ip); sym = map__find_function(map, ip, symbol_filter); } else { @@ -183,10 +182,9 @@ got_map: * the "[vdso]" dso, but for now lets use the old * trick of looking in the whole kernel symbol list. */ - if ((long long)ip < 0) { - map = kernel_map__functions; - goto got_map; - } + if ((long long)ip < 0) + sym = kernel_maps__find_function(ip, &map, + symbol_filter); } dump_printf(" ...... dso: %s\n", map ? map->dso->long_name : "<not found>"); diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index dc25231813ee..0b8a298d41ad 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -36,6 +36,7 @@ static int dso__load_kernel_sym(struct dso *self, struct map *map, unsigned int symbol__priv_size; static int vmlinux_path__nr_entries; static char **vmlinux_path; +static struct map *kernel_map__functions; static struct symbol_conf symbol_conf__defaults = { .use_modules = true, @@ -1164,8 +1165,6 @@ out: return ret; } -struct map *kernel_map__functions; - static void kernel_maps__insert(struct map *map) { maps__insert(&kernel_maps__functions, map); diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h index 5d0371fe8a06..fb0be9e92bf3 100644 --- a/tools/perf/util/symbol.h +++ b/tools/perf/util/symbol.h @@ -105,6 +105,5 @@ size_t kernel_maps__fprintf(FILE *fp); int symbol__init(struct symbol_conf *conf); extern struct list_head dsos__user, dsos__kernel; -extern struct map *kernel_map__functions; extern struct dso *vdso; #endif /* __PERF_SYMBOL */ |