[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/include/asm-ppc64/cputable.h b/include/asm-ppc64/cputable.h
index 3512140..3eef40e 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 @@
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 b04f1df..50420e7 100644
--- a/include/asm-ppc64/oprofile_impl.h
+++ b/include/asm-ppc64/oprofile_impl.h
@@ -37,7 +37,7 @@
};
/* 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 @@
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)
{
