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

Commit ef8828dd authored by Robert Richter's avatar Robert Richter
Browse files

x86/oprofile: pass the model to setup_ctrs() functions 



In follow-on patches the setup_ctrs() functions will need data that
describes the model. This patch extends the function argument list to
pass a pointer of the model to these function.

Signed-off-by: default avatarRobert Richter <robert.richter@amd.com>
parent 9c59354b

arch/x86/oprofile/nmi_int.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static void nmi_cpu_setup(void *dummy) 
	int cpu = smp_processor_id();

	struct op_msrs *msrs = &per_cpu(cpu_msrs, cpu);

	spin_lock(&oprofilefs_lock);

	model->setup_ctrs(msrs);

	model->setup_ctrs(model, msrs);

	spin_unlock(&oprofilefs_lock);

	per_cpu(saved_lvtpc, cpu) = apic_read(APIC_LVTPC);

	apic_write(APIC_LVTPC, APIC_DM_NMI);

arch/x86/oprofile/op_model_amd.c

+2 −1
Original line number Diff line number Diff line
@@ -85,7 +85,8 @@ static void op_amd_fill_in_addresses(struct op_msrs * const msrs) 
}





static void op_amd_setup_ctrs(struct op_msrs const * const msrs)

static void op_amd_setup_ctrs(struct op_x86_model_spec const *model,

			      struct op_msrs const * const msrs)

{

	unsigned int low, high;

	int i;

arch/x86/oprofile/op_model_p4.c

+2 −1
Original line number Diff line number Diff line
@@ -542,7 +542,8 @@ static void pmc_setup_one_p4_counter(unsigned int ctr) 
}





static void p4_setup_ctrs(struct op_msrs const * const msrs)

static void p4_setup_ctrs(struct op_x86_model_spec const *model,

			  struct op_msrs const * const msrs)

{

	unsigned int i;

	unsigned int low, high;

arch/x86/oprofile/op_model_ppro.c

+2 −1
Original line number Diff line number Diff line
@@ -51,7 +51,8 @@ static void ppro_fill_in_addresses(struct op_msrs * const msrs) 
}





static void ppro_setup_ctrs(struct op_msrs const * const msrs)

static void ppro_setup_ctrs(struct op_x86_model_spec const *model,

			    struct op_msrs const * const msrs)

{

	unsigned int low, high;

	int i;

arch/x86/oprofile/op_x86_model.h

+2 −1
Original line number Diff line number Diff line
@@ -48,7 +48,8 @@ struct op_x86_model_spec { 
	int		(*init)(struct oprofile_operations *ops);

	void		(*exit)(void);

	void		(*fill_in_addresses)(struct op_msrs * const msrs);

	void		(*setup_ctrs)(struct op_msrs const * const msrs);

	void		(*setup_ctrs)(struct op_x86_model_spec const *model,

				      struct op_msrs const * const msrs);

	int		(*check_ctrs)(struct pt_regs * const regs,

				      struct op_msrs const * const msrs);

	void		(*start)(struct op_msrs const * const msrs);