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

Commit 259a83a8 authored Jul 09, 2009 by Robert Richter

x86/oprofile: Remove const qualifier from struct op_x86_model_spec



This patch removes the const qualifier from struct
op_x86_model_spec to make model parameters changable.

Signed-off-by: Robert Richter <robert.richter@amd.com>

parent b28d1b92

arch/x86/oprofile/nmi_int.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -27,7 +27,7 @@
	#include "op_counter.h"		#include "op_counter.h"
	#include "op_x86_model.h"		#include "op_x86_model.h"

	static struct op_x86_model_spec const *model;		static struct op_x86_model_spec *model;
	static DEFINE_PER_CPU(struct op_msrs, cpu_msrs);		static DEFINE_PER_CPU(struct op_msrs, cpu_msrs);
	static DEFINE_PER_CPU(unsigned long, saved_lvtpc);		static DEFINE_PER_CPU(unsigned long, saved_lvtpc);

	@@ -542,7 +542,7 @@ module_param_call(cpu_type, force_cpu_type, NULL, NULL, 0);
	static int __init ppro_init(char **cpu_type)		static int __init ppro_init(char **cpu_type)
	{		{
	__u8 cpu_model = boot_cpu_data.x86_model;		__u8 cpu_model = boot_cpu_data.x86_model;
	struct op_x86_model_spec const spec = &op_ppro_spec; / default */		struct op_x86_model_spec spec = &op_ppro_spec; / default */

	if (force_arch_perfmon && cpu_has_arch_perfmon)		if (force_arch_perfmon && cpu_has_arch_perfmon)
	return 0;		return 0;

arch/x86/oprofile/op_model_amd.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -526,7 +526,7 @@ static void op_amd_exit(void) {}

	#endif /* CONFIG_OPROFILE_IBS */		#endif /* CONFIG_OPROFILE_IBS */

	struct op_x86_model_spec const op_amd_spec = {		struct op_x86_model_spec op_amd_spec = {
	.num_counters = NUM_COUNTERS,		.num_counters = NUM_COUNTERS,
	.num_controls = NUM_CONTROLS,		.num_controls = NUM_CONTROLS,
	.num_virt_counters = NUM_VIRT_COUNTERS,		.num_virt_counters = NUM_VIRT_COUNTERS,

arch/x86/oprofile/op_model_p4.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -695,7 +695,7 @@ static void p4_shutdown(struct op_msrs const * const msrs)


	#ifdef CONFIG_SMP		#ifdef CONFIG_SMP
	struct op_x86_model_spec const op_p4_ht2_spec = {		struct op_x86_model_spec op_p4_ht2_spec = {
	.num_counters = NUM_COUNTERS_HT2,		.num_counters = NUM_COUNTERS_HT2,
	.num_controls = NUM_CONTROLS_HT2,		.num_controls = NUM_CONTROLS_HT2,
	.num_virt_counters = NUM_COUNTERS_HT2,		.num_virt_counters = NUM_COUNTERS_HT2,
	@@ -709,7 +709,7 @@ struct op_x86_model_spec const op_p4_ht2_spec = {
	};		};
	#endif		#endif

	struct op_x86_model_spec const op_p4_spec = {		struct op_x86_model_spec op_p4_spec = {
	.num_counters = NUM_COUNTERS_NON_HT,		.num_counters = NUM_COUNTERS_NON_HT,
	.num_controls = NUM_CONTROLS_NON_HT,		.num_controls = NUM_CONTROLS_NON_HT,
	.num_virt_counters = NUM_COUNTERS_NON_HT,		.num_virt_counters = NUM_COUNTERS_NON_HT,

arch/x86/oprofile/op_model_ppro.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -203,7 +203,7 @@ static void ppro_shutdown(struct op_msrs const * const msrs)
	}		}


	struct op_x86_model_spec const op_ppro_spec = {		struct op_x86_model_spec op_ppro_spec = {
	.num_counters = 2,		.num_counters = 2,
	.num_controls = 2,		.num_controls = 2,
	.num_virt_counters = 2,		.num_virt_counters = 2,

arch/x86/oprofile/op_x86_model.h

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -62,10 +62,10 @@ extern u64 op_x86_get_ctrl(struct op_x86_model_spec const *model,
	struct op_counter_config *counter_config);		struct op_counter_config *counter_config);
	extern int op_x86_phys_to_virt(int phys);		extern int op_x86_phys_to_virt(int phys);

	extern struct op_x86_model_spec const op_ppro_spec;		extern struct op_x86_model_spec op_ppro_spec;
	extern struct op_x86_model_spec const op_p4_spec;		extern struct op_x86_model_spec op_p4_spec;
	extern struct op_x86_model_spec const op_p4_ht2_spec;		extern struct op_x86_model_spec op_p4_ht2_spec;
	extern struct op_x86_model_spec const op_amd_spec;		extern struct op_x86_model_spec op_amd_spec;
	extern struct op_x86_model_spec op_arch_perfmon_spec;		extern struct op_x86_model_spec op_arch_perfmon_spec;

	#endif /* OP_X86_MODEL_H */		#endif /* OP_X86_MODEL_H */