Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/core-7

Conflicts:
	include/linux/ftrace_event.h
	include/trace/ftrace.h
	kernel/trace/trace_event_perf.c
	kernel/trace/trace_kprobe.c
	kernel/trace/trace_syscalls.c

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

1 files changed, 27 insertions, 9 deletions

diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index f75c5f62401c..739c39fd0ade 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -1,3 +1,4 @@
+#include "build-id.h"
 #include "util.h"
 #include "hist.h"
 #include "session.h"
@@ -662,7 +663,7 @@ size_t hists__fprintf(struct hists *self, struct hists *pair,
         long displacement = 0;
         unsigned int width;
         const char *sep = symbol_conf.field_sep;
-        char *col_width = symbol_conf.col_width_list_str;
+        const char *col_width = symbol_conf.col_width_list_str;
 
         init_rem_hits();
 
@@ -988,22 +989,35 @@ int hist_entry__annotate(struct hist_entry *self, struct list_head *head)
         struct symbol *sym = self->ms.sym;
         struct map *map = self->ms.map;
         struct dso *dso = map->dso;
-        const char *filename = dso->long_name;
+        char *filename = dso__build_id_filename(dso, NULL, 0);
         char command[PATH_MAX * 2];
         FILE *file;
+        int err = -1;
         u64 len;
 
-        if (!filename)
-                return -1;
+        if (filename == NULL) {
+                if (dso->has_build_id) {
+                        pr_err("Can't annotate %s: not enough memory\n",
+                               sym->name);
+                        return -1;
+                }
+                /*
+                 * If we don't have build-ids, well, lets hope that this
+                 * DSO is the same as when 'perf record' ran.
+                 */
+                filename = dso->long_name;
+        }
 
         if (dso->origin == DSO__ORIG_KERNEL) {
-                if (dso->annotate_warned)
-                        return 0;
+                if (dso->annotate_warned) {
+                        err = 0;
+                        goto out_free_filename;
+                }
                 dso->annotate_warned = 1;
                 pr_err("Can't annotate %s: No vmlinux file was found in the "
                        "path:\n", sym->name);
                 vmlinux_path__fprintf(stderr);
-                return -1;
+                goto out_free_filename;
         }
 
         pr_debug("%s: filename=%s, sym=%s, start=%#Lx, end=%#Lx\n", __func__,
@@ -1025,14 +1039,18 @@ int hist_entry__annotate(struct hist_entry *self, struct list_head *head)
 
         file = popen(command, "r");
         if (!file)
-                return -1;
+                goto out_free_filename;
 
         while (!feof(file))
                 if (hist_entry__parse_objdump_line(self, file, head) < 0)
                         break;
 
         pclose(file);
-        return 0;
+        err = 0;
+out_free_filename:
+        if (dso->has_build_id)
+                free(filename);
+        return err;
 }
 
 void hists__inc_nr_events(struct hists *self, u32 type)