Merge branch 'linus' into release

Conflicts:
	drivers/acpi/debug.c

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 3 insertions, 5 deletions

diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index 96db5248e995..1478dc64bf15 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -61,11 +61,9 @@ static int hists__add_entry(struct hists *self, struct addr_location *al)
 static int process_sample_event(event_t *event, struct perf_session *session)
 {
         struct addr_location al;
+        struct sample_data data;
 
-        dump_printf("(IP, %d): %d: %#Lx\n", event->header.misc,
-                    event->ip.pid, event->ip.ip);
-
-        if (event__preprocess_sample(event, session, &al, NULL) < 0) {
+        if (event__preprocess_sample(event, session, &al, &data, NULL) < 0) {
                 pr_warning("problem processing %d event, skipping it.\n",
                            event->header.type);
                 return -1;
@@ -287,7 +285,7 @@ static int hist_entry__tty_annotate(struct hist_entry *he)
         LIST_HEAD(head);
         struct objdump_line *pos, *n;
 
-        if (hist_entry__annotate(he, &head) < 0)
+        if (hist_entry__annotate(he, &head, 0) < 0)
                 return -1;
 
         if (full_paths)