Merge branches 'pm-core', 'pm-qos', 'pm-domains' and 'pm-opp'

[linux.git] / tools / perf / builtin-kmem.c

diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
index 915869e00d863af03ca409f0f9ffa98147c45385..6da8d083e4e596d821673ed7408c814723029aca 100644 (file)
--- a/tools/perf/builtin-kmem.c
+++ b/tools/perf/builtin-kmem.c
@@ -1065,7 +1065,7 @@ static void __print_page_alloc_result(struct perf_session *session, int n_lines)
 
                data = rb_entry(next, struct page_stat, node);
                sym = machine__find_kernel_function(machine, data->callsite, &map);
-               if (sym && sym->name)
+               if (sym)
                        caller = sym->name;
                else
                        scnprintf(buf, sizeof(buf), "%"PRIx64, data->callsite);
@@ -1107,7 +1107,7 @@ static void __print_page_caller_result(struct perf_session *session, int n_lines
 
                data = rb_entry(next, struct page_stat, node);
                sym = machine__find_kernel_function(machine, data->callsite, &map);
-               if (sym && sym->name)
+               if (sym)
                        caller = sym->name;
                else
                        scnprintf(buf, sizeof(buf), "%"PRIx64, data->callsite);
@@ -1920,10 +1920,12 @@ int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused)
                NULL
        };
        struct perf_session *session;
-       int ret = -1;
        const char errmsg[] = "No %s allocation events found.  Have you run 'perf kmem record --%s'?\n";
+       int ret = perf_config(kmem_config, NULL);
+
+       if (ret)
+               return ret;
 
-       perf_config(kmem_config, NULL);
        argc = parse_options_subcommand(argc, argv, kmem_options,
                                        kmem_subcommands, kmem_usage, 0);
 
@@ -1948,6 +1950,8 @@ int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused)
        if (session == NULL)
                return -1;
 
+       ret = -1;
+
        if (kmem_slab) {
                if (!perf_evlist__find_tracepoint_by_name(session->evlist,
                                                          "kmem:kmalloc")) {