Merge branch 'oprofile/x86-oprofile-for-tip' into oprofile/oprofile-for-tip

Conflicts:
	arch/x86/oprofile/op_model_ppro.c

1 files changed, 6 insertions, 3 deletions

diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h
index 24ccdebf3ac1..825e79064d64 100644
--- a/arch/x86/oprofile/op_x86_model.h
+++ b/arch/x86/oprofile/op_x86_model.h
@@ -34,8 +34,8 @@ struct pt_regs;
 struct op_x86_model_spec {
         int (*init)(struct oprofile_operations *ops);
         void (*exit)(void);
-        unsigned int const num_counters;
-        unsigned int const num_controls;
+        unsigned int num_counters;
+        unsigned int num_controls;
         void (*fill_in_addresses)(struct op_msrs * const msrs);
         void (*setup_ctrs)(struct op_msrs const * const msrs);
         int (*check_ctrs)(struct pt_regs * const regs,
@@ -45,9 +45,12 @@ struct op_x86_model_spec {
         void (*shutdown)(struct op_msrs const * const msrs);
 };
 
-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 const op_p4_ht2_spec;
 extern struct op_x86_model_spec const op_amd_spec;
+extern struct op_x86_model_spec op_arch_perfmon_spec;
+
+extern void arch_perfmon_setup_counters(void);
 
 #endif /* OP_X86_MODEL_H */