perf machine: Shorten machine__load_kallsyms() signature
So far the only use is for MAP__FUNCTION, and since we're going to remove that split, remove the map_type argument in machine__load_kallsyms(). Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: David Ahern <dsahern@gmail.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Wang Nan <wangnan0@huawei.com> Link: https://lkml.kernel.org/n/tip-5dhgh7x8g9hx5hpxlp3k08jp@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Родитель
68a741868a
Коммит
329f0adef3
|
@ -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) <= 0) {
|
||||
if (machine__load_kallsyms(&kallsyms, "/proc/kallsyms") <= 0) {
|
||||
pr_debug("dso__load_kallsyms ");
|
||||
goto out;
|
||||
}
|
||||
|
|
|
@ -137,13 +137,11 @@ struct machine *machine__new_kallsyms(void)
|
|||
struct machine *machine = machine__new_host();
|
||||
/*
|
||||
* FIXME:
|
||||
* 1) MAP__FUNCTION will go away when we stop loading separate maps for
|
||||
* functions and data objects.
|
||||
* 2) We should switch to machine__load_kallsyms(), i.e. not explicitely
|
||||
* 1) We should switch to machine__load_kallsyms(), i.e. not explicitely
|
||||
* 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) <= 0) {
|
||||
if (machine && machine__load_kallsyms(machine, "/proc/kallsyms") <= 0) {
|
||||
machine__delete(machine);
|
||||
machine = NULL;
|
||||
}
|
||||
|
@ -988,7 +986,7 @@ 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,
|
||||
int __machine__load_kallsyms(struct machine *machine, const char *filename,
|
||||
enum map_type type)
|
||||
{
|
||||
struct map *map = machine__kernel_map(machine);
|
||||
|
|
|
@ -237,8 +237,14 @@ 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);
|
||||
int __machine__load_kallsyms(struct machine *machine, const char *filename,
|
||||
enum map_type type);
|
||||
|
||||
static inline int machine__load_kallsyms(struct machine *machine, const char *filename)
|
||||
{
|
||||
return __machine__load_kallsyms(machine, filename, MAP__FUNCTION);
|
||||
}
|
||||
|
||||
int machine__load_vmlinux_path(struct machine *machine, enum map_type type);
|
||||
|
||||
size_t machine__fprintf_dsos_buildid(struct machine *machine, FILE *fp,
|
||||
|
|
Загрузка…
Ссылка в новой задаче