[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>

diff --git a/arch/ppc/oprofile/common.c b/arch/ppc/oprofile/common.c
index 3169c67abea745c8ab254b85aba45363d2d252b7..a67d438a714429eaa68024782c2fc68c714de5f9 100644 (file)
--- 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 bc336dc971e35661cf4004ca2070312c614847f6..297f3097d2d9e332cbb7456abe22ffc75aa1d50d 100644 (file)
--- 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 fc9c859358c64f462a47d66edfcf44feabc9900b..8fc60f6055abd31d3bb34b971c73632a62224011 100644 (file)
--- 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 e5f572710aa07bb2e912ec8c58f2a6cd2cac9132..ff9361a07d39fc116704945c853c7bb29136c20f 100644 (file)
--- 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 32b2bb5625fe3a4f055e445ab1f4619b148f4844..88644931584707ad11fde6282465221350e253d9 100644 (file)
--- 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 08c5b333f5c4bfc5a266f294df95fb80c98cd5f8..e010b85996e87d7f08db8d991e055ab2be6b3eae 100644 (file)
--- 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 5e7a89c47b5b5e6169914851e3baf01bac1072a5..e9692a603cff170c78fa1d7ce52c1f1b523f7f33 100644 (file)
--- 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 35121408ed1cdc5b77313c3184b6365edb73e5fc..3eef40efd082dcc4179e259ec51eac6fe3a94446 100644 (file)
--- 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 b04f1dfb14219a9ac96a392db582bd22eecf9b69..50420e715f0544f378417206ada74693768803ea 100644 (file)
--- 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)
 {