aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/arch/arm/annotate/instructions.c
diff options
context:
space:
mode:
authorJiri Olsa <[email protected]>2017-10-11 15:01:24 +0000
committerArnaldo Carvalho de Melo <[email protected]>2017-10-23 14:20:54 +0000
commit696e2457e9fd285034cd30cd8c93ece5e6cfe35a (patch)
tree5b5b512cb3ac15953d10b7ab719054f228311675 /tools/perf/arch/arm/annotate/instructions.c
parentperf list: Fix group description in the man page (diff)
downloadkernel-696e2457e9fd285034cd30cd8c93ece5e6cfe35a.tar.gz
kernel-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 <[email protected]> Cc: Andi Kleen <[email protected]> Cc: David Ahern <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Peter Zijlstra <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
Diffstat (limited to 'tools/perf/arch/arm/annotate/instructions.c')
-rw-r--r--tools/perf/arch/arm/annotate/instructions.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/perf/arch/arm/annotate/instructions.c b/tools/perf/arch/arm/annotate/instructions.c
index 1ce0872b1726..6dfec7c23696 100644
--- a/tools/perf/arch/arm/annotate/instructions.c
+++ b/tools/perf/arch/arm/annotate/instructions.c
@@ -1,3 +1,4 @@
+#include <linux/compiler.h>
#include <sys/types.h>
#include <regex.h>
@@ -23,7 +24,7 @@ static struct ins_ops *arm__associate_instruction_ops(struct arch *arch, const c
return ops;
}
-static int arm__annotate_init(struct arch *arch)
+static int arm__annotate_init(struct arch *arch, char *cpuid __maybe_unused)
{
struct arm_annotate *arm;
int err;