Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 605ca4ba authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by Ingo Molnar
Browse files

perf symbols: Unexport kernel_map__functions 



perf annotate was the only user, and it doesn't really need it.

Signed-off-by: default avatarArnaldo 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: default avatarIngo Molnar <mingo@elte.hu>
parent b0da954a

tools/perf/builtin-annotate.c

+3 −5
Original line number Diff line number Diff line
@@ -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>");

tools/perf/util/symbol.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

tools/perf/util/symbol.h

+0 −1
Original line number Diff line number Diff line
@@ -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 */