aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2005-09-19 23:18:31 +1000
committerPaul Mackerras <paulus@samba.org>2005-09-21 19:21:08 +1000
commita3e48c10cca3287a845435dd8ca58ecbde72d847 (patch)
tree5976d3b64f272d4383e1dd710afc3b5afd6d08d9
parentd9e5b83b120dea9f306de06f7dead55103ab2d46 (diff)
[PATCH] powerpc: rename op_ppc{32,64}_model to op_powerpc_model
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--arch/ppc/oprofile/common.c2
-rw-r--r--arch/ppc/oprofile/op_impl.h2
-rw-r--r--arch/ppc/oprofile/op_model_fsl_booke.c2
-rw-r--r--arch/ppc64/oprofile/common.c2
-rw-r--r--arch/ppc64/oprofile/op_model_power4.c2
-rw-r--r--arch/ppc64/oprofile/op_model_rs64.c2
-rw-r--r--include/asm-ppc/perfmon.h2
-rw-r--r--include/asm-ppc64/cputable.h4
-rw-r--r--include/asm-ppc64/oprofile_impl.h6
9 files changed, 12 insertions, 12 deletions
diff --git a/arch/ppc/oprofile/common.c b/arch/ppc/oprofile/common.c
index 3169c67abea..a67d438a714 100644
--- a/arch/ppc/oprofile/common.c
+++ b/arch/ppc/oprofile/common.c
@@ -25,7 +25,7 @@
#include "op_impl.h"
-static struct op_ppc32_model *model;
+static struct op_powerpc_model *model;
static struct op_counter_config ctr[OP_MAX_COUNTER];
static struct op_system_config sys;
diff --git a/arch/ppc/oprofile/op_impl.h b/arch/ppc/oprofile/op_impl.h
index bc336dc971e..297f3097d2d 100644
--- a/arch/ppc/oprofile/op_impl.h
+++ b/arch/ppc/oprofile/op_impl.h
@@ -31,7 +31,7 @@ struct op_system_config {
};
/* Per-arch configuration */
-struct op_ppc32_model {
+struct op_powerpc_model {
void (*reg_setup) (struct op_counter_config *,
struct op_system_config *,
int num_counters);
diff --git a/arch/ppc/oprofile/op_model_fsl_booke.c b/arch/ppc/oprofile/op_model_fsl_booke.c
index fc9c859358c..8fc60f6055a 100644
--- a/arch/ppc/oprofile/op_model_fsl_booke.c
+++ b/arch/ppc/oprofile/op_model_fsl_booke.c
@@ -176,7 +176,7 @@ static void fsl_booke_handle_interrupt(struct pt_regs *regs,
pmc_start_ctrs(1);
}
-struct op_ppc32_model op_model_fsl_booke = {
+struct op_powerpc_model op_model_fsl_booke = {
.reg_setup = fsl_booke_reg_setup,
.start = fsl_booke_start,
.stop = fsl_booke_stop,
diff --git a/arch/ppc64/oprofile/common.c b/arch/ppc64/oprofile/common.c
index e5f572710aa..ff9361a07d3 100644
--- a/arch/ppc64/oprofile/common.c
+++ b/arch/ppc64/oprofile/common.c
@@ -19,7 +19,7 @@
#include <asm/cputable.h>
#include <asm/oprofile_impl.h>
-static struct op_ppc64_model *model;
+static struct op_powerpc_model *model;
static struct op_counter_config ctr[OP_MAX_COUNTER];
static struct op_system_config sys;
diff --git a/arch/ppc64/oprofile/op_model_power4.c b/arch/ppc64/oprofile/op_model_power4.c
index 32b2bb5625f..88644931584 100644
--- a/arch/ppc64/oprofile/op_model_power4.c
+++ b/arch/ppc64/oprofile/op_model_power4.c
@@ -300,7 +300,7 @@ static void power4_handle_interrupt(struct pt_regs *regs,
mtspr(SPRN_MMCR0, mmcr0);
}
-struct op_ppc64_model op_model_power4 = {
+struct op_powerpc_model op_model_power4 = {
.reg_setup = power4_reg_setup,
.cpu_setup = power4_cpu_setup,
.start = power4_start,
diff --git a/arch/ppc64/oprofile/op_model_rs64.c b/arch/ppc64/oprofile/op_model_rs64.c
index 08c5b333f5c..e010b85996e 100644
--- a/arch/ppc64/oprofile/op_model_rs64.c
+++ b/arch/ppc64/oprofile/op_model_rs64.c
@@ -209,7 +209,7 @@ static void rs64_handle_interrupt(struct pt_regs *regs,
mtspr(SPRN_MMCR0, mmcr0);
}
-struct op_ppc64_model op_model_rs64 = {
+struct op_powerpc_model op_model_rs64 = {
.reg_setup = rs64_reg_setup,
.cpu_setup = rs64_cpu_setup,
.start = rs64_start,
diff --git a/include/asm-ppc/perfmon.h b/include/asm-ppc/perfmon.h
index 5e7a89c47b5..e9692a603cf 100644
--- a/include/asm-ppc/perfmon.h
+++ b/include/asm-ppc/perfmon.h
@@ -16,7 +16,7 @@ void pmc_start_ctrs(int enable);
void pmc_stop_ctrs(void);
void dump_pmcs(void);
-extern struct op_ppc32_model op_model_fsl_booke;
+extern struct op_powerpc_model op_model_fsl_booke;
#endif
#endif /* __PERFMON_H */
diff --git a/include/asm-ppc64/cputable.h b/include/asm-ppc64/cputable.h
index 35121408ed1..3eef40efd08 100644
--- a/include/asm-ppc64/cputable.h
+++ b/include/asm-ppc64/cputable.h
@@ -36,7 +36,7 @@
* via the mkdefs mechanism.
*/
struct cpu_spec;
-struct op_ppc64_model;
+struct op_powerpc_model;
typedef void (*cpu_setup_t)(unsigned long offset, struct cpu_spec* spec);
@@ -65,7 +65,7 @@ struct cpu_spec {
char *oprofile_cpu_type;
/* Processor specific oprofile operations */
- struct op_ppc64_model *oprofile_model;
+ struct op_powerpc_model *oprofile_model;
};
extern struct cpu_spec cpu_specs[];
diff --git a/include/asm-ppc64/oprofile_impl.h b/include/asm-ppc64/oprofile_impl.h
index b04f1dfb142..50420e715f0 100644
--- a/include/asm-ppc64/oprofile_impl.h
+++ b/include/asm-ppc64/oprofile_impl.h
@@ -37,7 +37,7 @@ struct op_system_config {
};
/* Per-arch configuration */
-struct op_ppc64_model {
+struct op_powerpc_model {
void (*reg_setup) (struct op_counter_config *,
struct op_system_config *,
int num_counters);
@@ -49,8 +49,8 @@ struct op_ppc64_model {
int num_counters;
};
-extern struct op_ppc64_model op_model_rs64;
-extern struct op_ppc64_model op_model_power4;
+extern struct op_powerpc_model op_model_rs64;
+extern struct op_powerpc_model op_model_power4;
static inline unsigned int ctr_read(unsigned int i)
{