summaryrefslogtreecommitdiffstats
path: root/include/asm-powerpc/cputable.h
diff options
context:
space:
mode:
authorKumar Gala <galak@freescale.com>2005-09-27 15:13:12 -0500
committerPaul Mackerras <paulus@samba.org>2005-09-28 15:42:54 +1000
commit400d221274426958f1e1c7081a247bea9cede696 (patch)
treedb0907bc14504d827b06b45004152b6610387b40 /include/asm-powerpc/cputable.h
parent10b35d9978ac35556aec0d2642055742d8941488 (diff)
downloadop-kernel-dev-400d221274426958f1e1c7081a247bea9cede696.zip
op-kernel-dev-400d221274426958f1e1c7081a247bea9cede696.tar.gz
[PATCH] ppc32: make cur_cpu_spec a single pointer instead of an array
Changed ppc32 so that cur_cpu_spec is just a single pointer for all CPUs. Additionally, made call_setup_cpu check to see if the cpu_setup pointer is NULL or not before calling the function. This lets remove the dummy cpu_setup calls that just return. Signed-off-by: Kumar Gala <kumar.gala@freescale.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc/cputable.h')
-rw-r--r--include/asm-powerpc/cputable.h16
1 files changed, 0 insertions, 16 deletions
diff --git a/include/asm-powerpc/cputable.h b/include/asm-powerpc/cputable.h
index 5f81d44..1e50efa 100644
--- a/include/asm-powerpc/cputable.h
+++ b/include/asm-powerpc/cputable.h
@@ -25,11 +25,7 @@
struct cpu_spec;
struct op_powerpc_model;
-#ifdef __powerpc64__
typedef void (*cpu_setup_t)(unsigned long offset, struct cpu_spec* spec);
-#else /* __powerpc64__ */
-typedef void (*cpu_setup_t)(unsigned long offset, int cpu_nr, struct cpu_spec* spec);
-#endif /* __powerpc64__ */
struct cpu_spec {
/* CPU is matched via (PVR & pvr_mask) == pvr_value */
@@ -51,23 +47,15 @@ struct cpu_spec {
* BHT, SPD, etc... from head.S before branching to identify_machine
*/
cpu_setup_t cpu_setup;
-#ifdef __powerpc64__
/* Used by oprofile userspace to select the right counters */
char *oprofile_cpu_type;
/* Processor specific oprofile operations */
struct op_powerpc_model *oprofile_model;
-#endif /* __powerpc64__ */
};
-extern struct cpu_spec cpu_specs[];
-
-#ifdef __powerpc64__
extern struct cpu_spec *cur_cpu_spec;
-#else /* __powerpc64__ */
-extern struct cpu_spec *cur_cpu_spec[];
-#endif /* __powerpc64__ */
#endif /* __ASSEMBLY__ */
@@ -398,11 +386,7 @@ static inline int cpu_has_feature(unsigned long feature)
{
return (CPU_FTRS_ALWAYS & feature) ||
(CPU_FTRS_POSSIBLE
-#ifndef __powerpc64__
- & cur_cpu_spec[0]->cpu_features
-#else
& cur_cpu_spec->cpu_features
-#endif
& feature);
}
OpenPOWER on IntegriCloud