aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/arch/s390/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/s390/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/s390/annotate/instructions.c')
-rw-r--r--tools/perf/arch/s390/annotate/instructions.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/perf/arch/s390/annotate/instructions.c b/tools/perf/arch/s390/annotate/instructions.c
index 745b4b1b8b21..b8676ccbed76 100644
--- a/tools/perf/arch/s390/annotate/instructions.c
+++ b/tools/perf/arch/s390/annotate/instructions.c
@@ -1,3 +1,5 @@
+#include <linux/compiler.h>
+
static struct ins_ops *s390__associate_ins_ops(struct arch *arch, const char *name)
{
struct ins_ops *ops = NULL;
@@ -19,7 +21,7 @@ static struct ins_ops *s390__associate_ins_ops(struct arch *arch, const char *na
return ops;
}
-static int s390__annotate_init(struct arch *arch)
+static int s390__annotate_init(struct arch *arch, char *cpuid __maybe_unused)
{
if (!arch->initialized) {
arch->initialized = true;