From a6d64c548523c618396edc3e62dc5e7149485068 Mon Sep 17 00:00:00 2001
From: Robert Richter <robert.richter@amd.com>
Date: Mon, 25 May 2009 19:31:44 +0200
Subject: [PATCH] --- yaml --- r: 158203 b: refs/heads/master c:
 ef8828ddf828174785421af67c281144d4b8e796 h: refs/heads/master i:   158201:
 cd30081f33b3593300ec7eee620a6d196d7d500f   158199:
 9e03e005a63d43e926cc0e6d581073b10fb1d36d v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/x86/oprofile/nmi_int.c       | 2 +-
 trunk/arch/x86/oprofile/op_model_amd.c  | 3 ++-
 trunk/arch/x86/oprofile/op_model_p4.c   | 3 ++-
 trunk/arch/x86/oprofile/op_model_ppro.c | 3 ++-
 trunk/arch/x86/oprofile/op_x86_model.h  | 3 ++-
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index bb3533692ca4..b0b358a90d39 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c59354b48ce9cf28048b02fea73dd0236f876ea
+refs/heads/master: ef8828ddf828174785421af67c281144d4b8e796
diff --git a/trunk/arch/x86/oprofile/nmi_int.c b/trunk/arch/x86/oprofile/nmi_int.c
index ae0ab03959b4..c31f87bbf436 100644
--- a/trunk/arch/x86/oprofile/nmi_int.c
+++ b/trunk/arch/x86/oprofile/nmi_int.c
@@ -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);
diff --git a/trunk/arch/x86/oprofile/op_model_amd.c b/trunk/arch/x86/oprofile/op_model_amd.c
index aaa7ffaed6b9..86e0a01ba125 100644
--- a/trunk/arch/x86/oprofile/op_model_amd.c
+++ b/trunk/arch/x86/oprofile/op_model_amd.c
@@ -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;
diff --git a/trunk/arch/x86/oprofile/op_model_p4.c b/trunk/arch/x86/oprofile/op_model_p4.c
index 365d8a9c03d3..05ba0287b1f7 100644
--- a/trunk/arch/x86/oprofile/op_model_p4.c
+++ b/trunk/arch/x86/oprofile/op_model_p4.c
@@ -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;
diff --git a/trunk/arch/x86/oprofile/op_model_ppro.c b/trunk/arch/x86/oprofile/op_model_ppro.c
index 61ee8f640535..40b44ee521d5 100644
--- a/trunk/arch/x86/oprofile/op_model_ppro.c
+++ b/trunk/arch/x86/oprofile/op_model_ppro.c
@@ -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;
diff --git a/trunk/arch/x86/oprofile/op_x86_model.h b/trunk/arch/x86/oprofile/op_x86_model.h
index a207b1c46e26..6161c7f0e7fb 100644
--- a/trunk/arch/x86/oprofile/op_x86_model.h
+++ b/trunk/arch/x86/oprofile/op_x86_model.h
@@ -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);