[PATCH 08/10] perf tools: Remove machine__load_kallsyms function

[Jiri Olsa]

And replacing it with __machine__load_kallsyms function.

The current machine__load_kallsyms function has no caller,
so replacing it directly with __machine__load_kallsyms.
Also removing the no_kcore argument as it was always called
with true value.

Link: http://lkml.kernel.org/n/tip-kj9bpn6v213n6vaoe6ryx...@git.kernel.org
Signed-off-by: Jiri Olsa 
---
 tools/perf/tests/vmlinux-kallsyms.c |  2 +-
 tools/perf/util/machine.c   | 14 --
 tools/perf/util/machine.h   |  2 --
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/tools/perf/tests/vmlinux-kallsyms.c 
b/tools/perf/tests/vmlinux-kallsyms.c
index f6789fb029d6..58349297f9fb 100644
--- a/tools/perf/tests/vmlinux-kallsyms.c
+++ b/tools/perf/tests/vmlinux-kallsyms.c
@@ -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(, "/proc/kallsyms", type, true) 
<= 0) {
+   if (machine__load_kallsyms(, "/proc/kallsyms", type) <= 0) {
pr_debug("dso__load_kallsyms ");
goto out;
}
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index a02242eb25a1..9074c63c056e 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -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;
}
@@ -992,11 +992,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);
@@ -1011,12 +1011,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);
diff --git a/tools/perf/util/machine.h b/tools/perf/util/machine.h
index 50d587d34459..66cc200ef86f 100644
--- a/tools/perf/util/machine.h
+++ b/tools/perf/util/machine.h
@@ -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);
-- 
2.13.6

[PATCH 08/10] perf tools: Remove machine__load_kallsyms function

[Jiri Olsa]

And replacing it with __machine__load_kallsyms function.

The current machine__load_kallsyms function has no caller,
so replacing it directly with __machine__load_kallsyms.
Also removing the no_kcore argument as it was always called
with true value.

Link: http://lkml.kernel.org/n/tip-kj9bpn6v213n6vaoe6ryx...@git.kernel.org
Signed-off-by: Jiri Olsa 
---
 tools/perf/tests/vmlinux-kallsyms.c |  2 +-
 tools/perf/util/machine.c   | 14 --
 tools/perf/util/machine.h   |  2 --
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/tools/perf/tests/vmlinux-kallsyms.c 
b/tools/perf/tests/vmlinux-kallsyms.c
index f6789fb029d6..58349297f9fb 100644
--- a/tools/perf/tests/vmlinux-kallsyms.c
+++ b/tools/perf/tests/vmlinux-kallsyms.c
@@ -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(, "/proc/kallsyms", type, true) 
<= 0) {
+   if (machine__load_kallsyms(, "/proc/kallsyms", type) <= 0) {
pr_debug("dso__load_kallsyms ");
goto out;
}
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index a02242eb25a1..9074c63c056e 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -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;
}
@@ -992,11 +992,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);
@@ -1011,12 +1011,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);
diff --git a/tools/perf/util/machine.h b/tools/perf/util/machine.h
index 50d587d34459..66cc200ef86f 100644
--- a/tools/perf/util/machine.h
+++ b/tools/perf/util/machine.h
@@ -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);
-- 
2.13.6