Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core

Arjan & Linus Annotation Edition

 - Fix indirect calls beautifier, reported by Linus.

 - Use the objdump comments to nuke specificities about how access to a well
   know variable is encoded, suggested by Linus.

 - Show the number of places that jump to a target, requested by Arjan.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 14 insertions, 1 deletions

diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
index bb0a9f27165b..78a5692dd718 100644
--- a/tools/perf/util/annotate.h
+++ b/tools/perf/util/annotate.h
@@ -13,13 +13,26 @@ struct ins;
 struct ins_operands {
         char    *raw;
         struct {
+                char    *raw;
                 char    *name;
-                u64     offset;
                 u64     addr;
+                u64     offset;
         } target;
+        union {
+                struct {
+                        char    *raw;
+                        char    *name;
+                        u64     addr;
+                } source;
+                struct {
+                        struct ins *ins;
+                        struct ins_operands *ops;
+                } locked;
+        };
 };
 
 struct ins_ops {
+        void (*free)(struct ins_operands *ops);
         int (*parse)(struct ins_operands *ops);
         int (*scnprintf)(struct ins *ins, char *bf, size_t size,
                          struct ins_operands *ops);