Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 696e2457 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

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: default avatarJiri 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 98ad761b

tools/perf/arch/arm/annotate/instructions.c

+2 −1
Original line number Diff line number Diff line 
#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;

tools/perf/arch/arm64/annotate/instructions.c

+2 −1
Original line number Diff line number Diff line 
#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;

tools/perf/arch/powerpc/annotate/instructions.c

+3 −1
Original line number Diff line number Diff line 
#include <linux/compiler.h>



static struct ins_ops *powerpc__associate_instruction_ops(struct arch *arch, const char *name)

{

	int i;
@@ -46,7 +48,7 @@ static struct ins_ops *powerpc__associate_instruction_ops(struct arch *arch, con 
	return ops;

}



static int powerpc__annotate_init(struct arch *arch)

static int powerpc__annotate_init(struct arch *arch, char *cpuid __maybe_unused)

{

	if (!arch->initialized) {

		arch->initialized = true;

tools/perf/arch/s390/annotate/instructions.c

+3 −1
Original line number Diff line number Diff line 
#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;

tools/perf/arch/x86/annotate/instructions.c

+14 −0
Original line number Diff line number Diff line
@@ -122,3 +122,17 @@ static int x86__cpuid_parse(struct arch *arch, char *cpuid) 


	return -1;

}



static int x86__annotate_init(struct arch *arch, char *cpuid)

{

	int err = 0;



	if (arch->initialized)

		return 0;



	if (cpuid)

		err = x86__cpuid_parse(arch, cpuid);



	arch->initialized = true;

	return err;

}