summaryrefslogtreecommitdiff
path: root/tools/perf/util/annotate.h
diff options
context:
space:
mode:
authorJiri Olsa <jolsa@kernel.org>2017-10-11 17:01:27 +0200
committerArnaldo Carvalho de Melo <acme@redhat.com>2017-11-13 09:39:58 -0300
commit37236d5e0b6a765319dec3e64d828cb44ebecac6 (patch)
tree8d085e8cf65f12677f0d3cf11cde8278dfb31c1f /tools/perf/util/annotate.h
parentd5490b9647e6e41b203186ed0d73b4103f139fda (diff)
downloadlwn-37236d5e0b6a765319dec3e64d828cb44ebecac6.tar.gz
lwn-37236d5e0b6a765319dec3e64d828cb44ebecac6.zip
perf annotate: Move ipc/cycles into annotation_line struct
Move ipc/cycles into annotation_line struct to be used as generic members for any annotation source. Signed-off-by: Jiri Olsa <jolsa@kernel.org> Cc: Andi Kleen <andi@firstfloor.org> Cc: David Ahern <dsahern@gmail.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/20171011150158.11895-5-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/annotate.h')
-rw-r--r--tools/perf/util/annotate.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
index b7ca62855760..a822c0a4987e 100644
--- a/tools/perf/util/annotate.h
+++ b/tools/perf/util/annotate.h
@@ -64,13 +64,13 @@ struct annotation_line {
s64 offset;
char *line;
int line_nr;
+ float ipc;
+ u64 cycles;
};
struct disasm_line {
struct annotation_line al;
struct ins ins;
- float ipc;
- u64 cycles;
struct ins_operands ops;
};