Skip to content

Commit

Permalink
perf symbols: Unexport kernel_map__functions
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Arnaldo Carvalho de Melo authored and Ingo Molnar committed Nov 27, 2009
1 parent b0da954 commit 605ca4b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 8 deletions.
8 changes: 3 additions & 5 deletions tools/perf/builtin-annotate.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -183,10 +182,9 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head)
* 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>");
Expand Down
3 changes: 1 addition & 2 deletions tools/perf/util/symbol.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -1164,8 +1165,6 @@ int dso__load(struct dso *self, struct map *map, symbol_filter_t filter)
return ret;
}

struct map *kernel_map__functions;

static void kernel_maps__insert(struct map *map)
{
maps__insert(&kernel_maps__functions, map);
Expand Down
1 change: 0 additions & 1 deletion tools/perf/util/symbol.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

0 comments on commit 605ca4b

Please sign in to comment.