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

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

New features:

- Improve ARM support in the annotation code, affecting 'perf annotate', 'perf
  report' and live annotation in 'perf top' (Kim Phillips)

- Initial support for PowerPC in the annotation code (Ravi Bangoria)

- Skip repetitive scheduler function on the top of the stack in
  'perf sched timehist' (Namhyung Kim)

Fixes:

- Fix maps resolution in libbpf (Eric Leblond)

- Get the kernel signature via /proc/version_signature, available on
  Ubuntu systems, to make sure BPF proggies works, as the one provided
  via 'uname -r' doesn't (Wang Nan)

- Fix segfault in 'perf record' when running with suid and kptr_restrict
  is 1 (Wang Nan)

Infrastructure changes:

- Support per-arch instruction tables, kept via a static or dynamic table
  (Arnaldo Carvalho de Melo)

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

1 files changed, 9 insertions, 9 deletions

diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index e6e9f7d80dbd..cee0eee31ce6 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -213,17 +213,17 @@ static void annotate_browser__write(struct ui_browser *browser, void *entry, int
                 ui_browser__write_nstring(browser, bf, printed);
                 if (change_color)
                         ui_browser__set_color(browser, color);
-                if (dl->ins && dl->ins->ops->scnprintf) {
-                        if (ins__is_jump(dl->ins)) {
+                if (dl->ins.ops && dl->ins.ops->scnprintf) {
+                        if (ins__is_jump(&dl->ins)) {
                                 bool fwd = dl->ops.target.offset > (u64)dl->offset;
 
                                 ui_browser__write_graph(browser, fwd ? SLSMG_DARROW_CHAR :
                                                                     SLSMG_UARROW_CHAR);
                                 SLsmg_write_char(' ');
-                        } else if (ins__is_call(dl->ins)) {
+                        } else if (ins__is_call(&dl->ins)) {
                                 ui_browser__write_graph(browser, SLSMG_RARROW_CHAR);
                                 SLsmg_write_char(' ');
-                        } else if (ins__is_ret(dl->ins)) {
+                        } else if (ins__is_ret(&dl->ins)) {
                                 ui_browser__write_graph(browser, SLSMG_LARROW_CHAR);
                                 SLsmg_write_char(' ');
                         } else {
@@ -243,7 +243,7 @@ static void annotate_browser__write(struct ui_browser *browser, void *entry, int
 
 static bool disasm_line__is_valid_jump(struct disasm_line *dl, struct symbol *sym)
 {
-        if (!dl || !dl->ins || !ins__is_jump(dl->ins)
+        if (!dl || !dl->ins.ops || !ins__is_jump(&dl->ins)
             || !disasm_line__has_offset(dl)
             || dl->ops.target.offset >= symbol__size(sym))
                 return false;
@@ -492,7 +492,7 @@ static bool annotate_browser__callq(struct annotate_browser *browser,
         };
         char title[SYM_TITLE_MAX_SIZE];
 
-        if (!ins__is_call(dl->ins))
+        if (!ins__is_call(&dl->ins))
                 return false;
 
         if (map_groups__find_ams(&target) ||
@@ -545,7 +545,7 @@ static bool annotate_browser__jump(struct annotate_browser *browser)
         struct disasm_line *dl = browser->selection;
         s64 idx;
 
-        if (!ins__is_jump(dl->ins))
+        if (!ins__is_jump(&dl->ins))
                 return false;
 
         dl = annotate_browser__find_offset(browser, dl->ops.target.offset, &idx);
@@ -841,9 +841,9 @@ show_help:
                                 ui_helpline__puts("Huh? No selection. Report to linux-kernel@vger.kernel.org");
                         else if (browser->selection->offset == -1)
                                 ui_helpline__puts("Actions are only available for assembly lines.");
-                        else if (!browser->selection->ins)
+                        else if (!browser->selection->ins.ops)
                                 goto show_sup_ins;
-                        else if (ins__is_ret(browser->selection->ins))
+                        else if (ins__is_ret(&browser->selection->ins))
                                 goto out;
                         else if (!(annotate_browser__jump(browser) ||
                                      annotate_browser__callq(browser, evsel, hbt))) {