Commit a3e48c10 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras

[PATCH] powerpc: rename op_ppc{32,64}_model to op_powerpc_model

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent d9e5b83b
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "op_impl.h" #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_counter_config ctr[OP_MAX_COUNTER];
static struct op_system_config sys; static struct op_system_config sys;
......
...@@ -31,7 +31,7 @@ struct op_system_config { ...@@ -31,7 +31,7 @@ struct op_system_config {
}; };
/* Per-arch configuration */ /* Per-arch configuration */
struct op_ppc32_model { struct op_powerpc_model {
void (*reg_setup) (struct op_counter_config *, void (*reg_setup) (struct op_counter_config *,
struct op_system_config *, struct op_system_config *,
int num_counters); int num_counters);
......
...@@ -176,7 +176,7 @@ static void fsl_booke_handle_interrupt(struct pt_regs *regs, ...@@ -176,7 +176,7 @@ static void fsl_booke_handle_interrupt(struct pt_regs *regs,
pmc_start_ctrs(1); 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, .reg_setup = fsl_booke_reg_setup,
.start = fsl_booke_start, .start = fsl_booke_start,
.stop = fsl_booke_stop, .stop = fsl_booke_stop,
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <asm/cputable.h> #include <asm/cputable.h>
#include <asm/oprofile_impl.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_counter_config ctr[OP_MAX_COUNTER];
static struct op_system_config sys; static struct op_system_config sys;
......
...@@ -300,7 +300,7 @@ static void power4_handle_interrupt(struct pt_regs *regs, ...@@ -300,7 +300,7 @@ static void power4_handle_interrupt(struct pt_regs *regs,
mtspr(SPRN_MMCR0, mmcr0); mtspr(SPRN_MMCR0, mmcr0);
} }
struct op_ppc64_model op_model_power4 = { struct op_powerpc_model op_model_power4 = {
.reg_setup = power4_reg_setup, .reg_setup = power4_reg_setup,
.cpu_setup = power4_cpu_setup, .cpu_setup = power4_cpu_setup,
.start = power4_start, .start = power4_start,
......
...@@ -209,7 +209,7 @@ static void rs64_handle_interrupt(struct pt_regs *regs, ...@@ -209,7 +209,7 @@ static void rs64_handle_interrupt(struct pt_regs *regs,
mtspr(SPRN_MMCR0, mmcr0); mtspr(SPRN_MMCR0, mmcr0);
} }
struct op_ppc64_model op_model_rs64 = { struct op_powerpc_model op_model_rs64 = {
.reg_setup = rs64_reg_setup, .reg_setup = rs64_reg_setup,
.cpu_setup = rs64_cpu_setup, .cpu_setup = rs64_cpu_setup,
.start = rs64_start, .start = rs64_start,
......
...@@ -16,7 +16,7 @@ void pmc_start_ctrs(int enable); ...@@ -16,7 +16,7 @@ void pmc_start_ctrs(int enable);
void pmc_stop_ctrs(void); void pmc_stop_ctrs(void);
void dump_pmcs(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
#endif /* __PERFMON_H */ #endif /* __PERFMON_H */
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
* via the mkdefs mechanism. * via the mkdefs mechanism.
*/ */
struct cpu_spec; struct cpu_spec;
struct op_ppc64_model; struct op_powerpc_model;
typedef void (*cpu_setup_t)(unsigned long offset, struct cpu_spec* spec); typedef void (*cpu_setup_t)(unsigned long offset, struct cpu_spec* spec);
...@@ -65,7 +65,7 @@ struct cpu_spec { ...@@ -65,7 +65,7 @@ struct cpu_spec {
char *oprofile_cpu_type; char *oprofile_cpu_type;
/* Processor specific oprofile operations */ /* Processor specific oprofile operations */
struct op_ppc64_model *oprofile_model; struct op_powerpc_model *oprofile_model;
}; };
extern struct cpu_spec cpu_specs[]; extern struct cpu_spec cpu_specs[];
......
...@@ -37,7 +37,7 @@ struct op_system_config { ...@@ -37,7 +37,7 @@ struct op_system_config {
}; };
/* Per-arch configuration */ /* Per-arch configuration */
struct op_ppc64_model { struct op_powerpc_model {
void (*reg_setup) (struct op_counter_config *, void (*reg_setup) (struct op_counter_config *,
struct op_system_config *, struct op_system_config *,
int num_counters); int num_counters);
...@@ -49,8 +49,8 @@ struct op_ppc64_model { ...@@ -49,8 +49,8 @@ struct op_ppc64_model {
int num_counters; int num_counters;
}; };
extern struct op_ppc64_model op_model_rs64; extern struct op_powerpc_model op_model_rs64;
extern struct op_ppc64_model op_model_power4; extern struct op_powerpc_model op_model_power4;
static inline unsigned int ctr_read(unsigned int i) static inline unsigned int ctr_read(unsigned int i)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment