Commit e8f3879f authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf machine: Remove machine__load_kallsyms() 



The current machine__load_kallsyms() function has no caller, so replace
it directly with __machine__load_kallsyms().  Also remove the no_kcore
argument as it was always called with a 'true' value.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20180215122635.24029-8-jolsa@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 1fb87b8e

tools/perf/tests/vmlinux-kallsyms.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ int test__vmlinux_matches_kallsyms(struct test *test __maybe_unused, int subtest 
	 * be compacted against the list of modules found in the "vmlinux"

	 * code and with the one got from /proc/modules from the "kallsyms" code.

	 */

	if (__machine__load_kallsyms(&kallsyms, "/proc/kallsyms", type, true) <= 0) {

	if (machine__load_kallsyms(&kallsyms, "/proc/kallsyms", type) <= 0) {

		pr_debug("dso__load_kallsyms ");

		goto out;

	}

tools/perf/util/machine.c

+4 −10
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ struct machine *machine__new_kallsyms(void) 
	 *    ask for not using the kcore parsing code, once this one is fixed

	 *    to create a map per module.

	 */

	if (machine && __machine__load_kallsyms(machine, "/proc/kallsyms", MAP__FUNCTION, true) <= 0) {

	if (machine && machine__load_kallsyms(machine, "/proc/kallsyms", MAP__FUNCTION) <= 0) {

		machine__delete(machine);

		machine = NULL;

	}
@@ -991,11 +991,11 @@ int machines__create_kernel_maps(struct machines *machines, pid_t pid) 
	return machine__create_kernel_maps(machine);

}



int __machine__load_kallsyms(struct machine *machine, const char *filename,

			     enum map_type type, bool no_kcore)

int machine__load_kallsyms(struct machine *machine, const char *filename,

			     enum map_type type)

{

	struct map *map = machine__kernel_map(machine);

	int ret = __dso__load_kallsyms(map->dso, filename, map, no_kcore);

	int ret = __dso__load_kallsyms(map->dso, filename, map, true);



	if (ret > 0) {

		dso__set_loaded(map->dso, type);
@@ -1010,12 +1010,6 @@ int __machine__load_kallsyms(struct machine *machine, const char *filename, 
	return ret;

}



int machine__load_kallsyms(struct machine *machine, const char *filename,

			   enum map_type type)

{

	return __machine__load_kallsyms(machine, filename, type, false);

}



int machine__load_vmlinux_path(struct machine *machine, enum map_type type)

{

	struct map *map = machine__kernel_map(machine);

tools/perf/util/machine.h

+0 −2
Original line number Diff line number Diff line
@@ -225,8 +225,6 @@ struct map *machine__findnew_module_map(struct machine *machine, u64 start, 
					const char *filename);

int arch__fix_module_text_start(u64 *start, const char *name);



int __machine__load_kallsyms(struct machine *machine, const char *filename,

			     enum map_type type, bool no_kcore);

int machine__load_kallsyms(struct machine *machine, const char *filename,

			   enum map_type type);

int machine__load_vmlinux_path(struct machine *machine, enum map_type type);

CRA Git | Maintained and supported by SUSTech CRA and CCSE