summaryrefslogtreecommitdiffstats
path: root/tools/perf/arch/arm64/annotate/instructions.c
diff options
context:
space:
mode:
authorJiri Olsa2017-10-11 17:01:24 +0200
committerArnaldo Carvalho de Melo2017-10-23 16:20:54 +0200
commit696e2457e9fd285034cd30cd8c93ece5e6cfe35a (patch)
tree5b5b512cb3ac15953d10b7ab719054f228311675 /tools/perf/arch/arm64/annotate/instructions.c
parentperf list: Fix group description in the man page (diff)
downloadkernel-qcow2-linux-696e2457e9fd285034cd30cd8c93ece5e6cfe35a.tar.gz
kernel-qcow2-linux-696e2457e9fd285034cd30cd8c93ece5e6cfe35a.tar.xz
kernel-qcow2-linux-696e2457e9fd285034cd30cd8c93ece5e6cfe35a.zip
perf annotate: Remove arch::cpuid_parse callback
There's no need for extra cpuid_parse arch callback, it can be handled directly in init callback. Adding the init function to x86 to cover the cpuid initialization. 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-2-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/arch/arm64/annotate/instructions.c')
-rw-r--r--tools/perf/arch/arm64/annotate/instructions.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/perf/arch/arm64/annotate/instructions.c b/tools/perf/arch/arm64/annotate/instructions.c
index 8f1908756cb6..a2c32be4132a 100644
--- a/tools/perf/arch/arm64/annotate/instructions.c
+++ b/tools/perf/arch/arm64/annotate/instructions.c
@@ -1,3 +1,4 @@
+#include <linux/compiler.h>
#include <sys/types.h>
#include <regex.h>
@@ -25,7 +26,7 @@ static struct ins_ops *arm64__associate_instruction_ops(struct arch *arch, const
return ops;
}
-static int arm64__annotate_init(struct arch *arch)
+static int arm64__annotate_init(struct arch *arch, char *cpuid __maybe_unused)
{
struct arm64_annotate *arm;
int err;