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

Commit 849620fa authored by Robert Richter's avatar Robert Richter
Browse files

Revert "oprofile: discover counters for op ppro too" 



This reverts commit 59512900.

arch_perfmon_setup_counters() is actually never called for ppro, so
there is no code that changes the numbers in op_ppro_spec. The patch
as it is has no effect.

Cc: Andi Kleen <ak@linux.intel.com>
Signed-off-by: default avatarRobert Richter <robert.richter@amd.com>
parent 0886751c

arch/x86/oprofile/op_model_ppro.c

+3 −5
Original line number Diff line number Diff line
@@ -213,9 +213,9 @@ static void ppro_shutdown(struct op_msrs const * const msrs) 
}





struct op_x86_model_spec op_ppro_spec = {

	.num_counters		= 2,	/* can be overriden */

	.num_controls		= 2,	/* dito */

struct op_x86_model_spec const op_ppro_spec = {

	.num_counters		= 2,

	.num_controls		= 2,

	.fill_in_addresses	= &ppro_fill_in_addresses,

	.setup_ctrs		= &ppro_setup_ctrs,

	.check_ctrs		= &ppro_check_ctrs,
@@ -251,8 +251,6 @@ void arch_perfmon_setup_counters(void) 


	op_arch_perfmon_spec.num_counters = num_counters;

	op_arch_perfmon_spec.num_controls = num_counters;

	op_ppro_spec.num_counters = num_counters;

	op_ppro_spec.num_controls = num_counters;

}



struct op_x86_model_spec op_arch_perfmon_spec = {

arch/x86/oprofile/op_x86_model.h

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ struct op_x86_model_spec { 
	void (*shutdown)(struct op_msrs const * const msrs);

};



extern struct op_x86_model_spec op_ppro_spec;

extern struct op_x86_model_spec const op_ppro_spec;

extern struct op_x86_model_spec const op_p4_spec;

extern struct op_x86_model_spec const op_p4_ht2_spec;

extern struct op_x86_model_spec const op_amd_spec;