perf_counter tools: Consolidate dso methods to load kernel symbols

Now one has just to use dso__load_kernel() optionally passing a vmlinux
filename.

Will make things easier for perf top that will want to pass a callback
to filter some symbols.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 7 deletions

diff --git a/Documentation/perf_counter/builtin-report.c b/Documentation/perf_counter/builtin-report.c
index 889067eb2b69..4e9f2bc10452 100644
--- a/Documentation/perf_counter/builtin-report.c
+++ b/Documentation/perf_counter/builtin-report.c
@@ -118,18 +118,13 @@ static void dsos__fprintf(FILE *fp)
 
 static int load_kernel(void)
 {
-        int err = -1;
+        int err;
 
         kernel_dso = dso__new("[kernel]", 0);
         if (!kernel_dso)
                 return -1;
 
-        if (vmlinux)
-                err = dso__load_vmlinux(kernel_dso, vmlinux);
-
-        if (err)
-                err = dso__load_kallsyms(kernel_dso);
-
+        err = dso__load_kernel(kernel_dso, vmlinux);
         if (err) {
                 dso__delete(kernel_dso);
                 kernel_dso = NULL;