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

1 files changed, 2 insertions, 4 deletions

diff --git a/arch/powerpc/oprofile/common.c b/arch/powerpc/oprofile/common.c
index 88b4118fd0c5..0ec12c8f2c01 100644
--- a/arch/powerpc/oprofile/common.c
+++ b/arch/powerpc/oprofile/common.c
@@ -155,8 +155,6 @@ static int op_powerpc_create_files(struct super_block *sb, struct dentry *root)
 int __init oprofile_arch_init(struct oprofile_operations *ops)
 {
 #ifndef __powerpc64__
-        int cpu_id = smp_processor_id();
-
 #ifdef CONFIG_FSL_BOOKE
         model = &op_model_fsl_booke;
 #else
@@ -167,9 +165,9 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
         if (NULL == cpu_type)
                 return -ENOMEM;
 
-        sprintf(cpu_type, "ppc/%s", cur_cpu_spec[cpu_id]->cpu_name);
+        sprintf(cpu_type, "ppc/%s", cur_cpu_spec->cpu_name);
 
-        model->num_counters = cur_cpu_spec[cpu_id]->num_pmcs;
+        model->num_counters = cur_cpu_spec->num_pmcs;
 
         ops->cpu_type = cpu_type;
 #else /* __powerpc64__ */