Merge branch 'next' into for-linus

Prepare input updates for 3.16.

1 files changed, 16 insertions, 2 deletions

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 76cd510d34d0..65aaa5bbf7ec 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -176,7 +176,7 @@ static void perf_top__record_precise_ip(struct perf_top *top,
 {
         struct annotation *notes;
         struct symbol *sym;
-        int err;
+        int err = 0;
 
         if (he == NULL || he->ms.sym == NULL ||
             ((top->sym_filter_entry == NULL ||
@@ -190,7 +190,9 @@ static void perf_top__record_precise_ip(struct perf_top *top,
                 return;
 
         ip = he->ms.map->map_ip(he->ms.map, ip);
-        err = hist_entry__inc_addr_samples(he, counter, ip);
+
+        if (ui__has_annotation())
+                err = hist_entry__inc_addr_samples(he, counter, ip);
 
         pthread_mutex_unlock(&notes->lock);
 
@@ -991,6 +993,16 @@ parse_callchain_opt(const struct option *opt, const char *arg, int unset)
         return record_parse_callchain_opt(opt, arg, unset);
 }
 
+static int perf_top_config(const char *var, const char *value, void *cb)
+{
+        struct perf_top *top = cb;
+
+        if (!strcmp(var, "top.call-graph"))
+                return record_parse_callchain(value, &top->record_opts);
+
+        return perf_default_config(var, value, cb);
+}
+
 static int
 parse_percent_limit(const struct option *opt, const char *arg,
                     int unset __maybe_unused)
@@ -1115,6 +1127,8 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)
         if (top.evlist == NULL)
                 return -ENOMEM;
 
+        perf_config(perf_top_config, &top);
+
         argc = parse_options(argc, argv, options, top_usage, 0);
         if (argc)
                 usage_with_options(top_usage, options);