GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-05 05:42:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

perf machine: Remove machine__load_kallsyms()

Browse source 
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: Jiri 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: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa 2018-02-15 13:26:33 +01:00 • committed by Arnaldo Carvalho de Melo
parent 1fb87b8e95
commit e8f3879f76
3 changed files with 5 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tools/perf/tests/vmlinux-kallsyms.c
View file

@ -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" * be compacted against the list of modules found in the "vmlinux"
* code and with the one got from /proc/modules from the "kallsyms" code. * 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 "); pr_debug("dso__load_kallsyms ");
goto out; goto out;
} }

14
tools/perf/util/machine.c
View file

@ -151,7 +151,7 @@ struct machine *machine__new_kallsyms(void)
* ask for not using the kcore parsing code, once this one is fixed * ask for not using the kcore parsing code, once this one is fixed
* to create a map per module. * 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__delete(machine);
machine = NULL; machine = NULL;
} }
@ -991,11 +991,11 @@ int machines__create_kernel_maps(struct machines *machines, pid_t pid)
return machine__create_kernel_maps(machine); return machine__create_kernel_maps(machine);
} }
int __machine__load_kallsyms(struct machine *machine, const char *filename, int machine__load_kallsyms(struct machine *machine, const char *filename,
enum map_type type, bool no_kcore) enum map_type type)
{ {
struct map *map = machine__kernel_map(machine); 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) { if (ret > 0) {
dso__set_loaded(map->dso, type); dso__set_loaded(map->dso, type);
@ -1010,12 +1010,6 @@ int __machine__load_kallsyms(struct machine *machine, const char *filename,
return ret; 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) int machine__load_vmlinux_path(struct machine *machine, enum map_type type)
{ {
struct map *map = machine__kernel_map(machine); struct map *map = machine__kernel_map(machine);

2
tools/perf/util/machine.h
View file

@ -225,8 +225,6 @@ struct map *machine__findnew_module_map(struct machine *machine, u64 start,
const char *filename); const char *filename);
int arch__fix_module_text_start(u64 *start, const char *name); 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, int machine__load_kallsyms(struct machine *machine, const char *filename,
enum map_type type); enum map_type type);
int machine__load_vmlinux_path(struct machine *machine, enum map_type type); int machine__load_vmlinux_path(struct machine *machine, enum map_type type);