Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / arch / sparc / kernel / smp.c

diff --git a/arch/sparc/kernel/smp.c b/arch/sparc/kernel/smp.c
index 276f228..40b42c8 100644 (file)
--- a/arch/sparc/kernel/smp.c
+++ b/arch/sparc/kernel/smp.c
@@ -34,6 +34,7 @@
 #include <asm/tlbflush.h>
 #include <asm/cpudata.h>
 
+volatile int smp_processors_ready = 0;
 int smp_num_cpus = 1;
 volatile unsigned long cpu_callin_map[NR_CPUS] __initdata = {0,};
 unsigned char boot_cpu_id = 0;
@@ -57,7 +58,7 @@ cpumask_t smp_commenced_mask = CPU_MASK_NONE;
 /* Used to make bitops atomic */
 unsigned char bitops_spinlock = 0;
 
-void __cpuinit smp_store_cpu_info(int id)
+void __init smp_store_cpu_info(int id)
 {
        int cpu_node;
 
@@ -86,7 +87,6 @@ void __cpuinit smp_store_cpu_info(int id)
 void __init smp_cpus_done(unsigned int max_cpus)
 {
        extern void smp4m_smp_done(void);
-       extern void smp4d_smp_done(void);
        unsigned long bogosum = 0;
        int cpu, num;
 
@@ -100,34 +100,8 @@ void __init smp_cpus_done(unsigned int max_cpus)
                num, bogosum/(500000/HZ),
                (bogosum/(5000/HZ))%100);
 
-       switch(sparc_cpu_model) {
-       case sun4:
-               printk("SUN4\n");
-               BUG();
-               break;
-       case sun4c:
-               printk("SUN4C\n");
-               BUG();
-               break;
-       case sun4m:
-               smp4m_smp_done();
-               break;
-       case sun4d:
-               smp4d_smp_done();
-               break;
-       case sun4e:
-               printk("SUN4E\n");
-               BUG();
-               break;
-       case sun4u:
-               printk("SUN4U\n");
-               BUG();
-               break;
-       default:
-               printk("UNKNOWN!\n");
-               BUG();
-               break;
-       };
+       BUG_ON(sparc_cpu_model != sun4m);
+       smp4m_smp_done();
 }
 
 void cpu_panic(void)
@@ -293,71 +267,30 @@ int setup_profiling_timer(unsigned int multiplier)
 void __init smp_prepare_cpus(unsigned int max_cpus)
 {
        extern void smp4m_boot_cpus(void);
-       extern void smp4d_boot_cpus(void);
-       int i, cpuid, extra;
+       int i, cpuid, ncpus, extra;
 
+       BUG_ON(sparc_cpu_model != sun4m);
        printk("Entering SMP Mode...\n");
 
+       ncpus = 1;
        extra = 0;
        for (i = 0; !cpu_find_by_instance(i, NULL, &cpuid); i++) {
-               if (cpuid >= NR_CPUS)
+               if (cpuid == boot_cpu_id)
+                       continue;
+               if (cpuid < NR_CPUS && ncpus++ < max_cpus)
+                       cpu_set(cpuid, phys_cpu_present_map);
+               else
                        extra++;
        }
-       /* i = number of cpus */
-       if (extra && max_cpus > i - extra)
+       if (max_cpus >= NR_CPUS && extra)
                printk("Warning: NR_CPUS is too low to start all cpus\n");
 
        smp_store_cpu_info(boot_cpu_id);
 
-       switch(sparc_cpu_model) {
-       case sun4:
-               printk("SUN4\n");
-               BUG();
-               break;
-       case sun4c:
-               printk("SUN4C\n");
-               BUG();
-               break;
-       case sun4m:
-               smp4m_boot_cpus();
-               break;
-       case sun4d:
-               smp4d_boot_cpus();
-               break;
-       case sun4e:
-               printk("SUN4E\n");
-               BUG();
-               break;
-       case sun4u:
-               printk("SUN4U\n");
-               BUG();
-               break;
-       default:
-               printk("UNKNOWN!\n");
-               BUG();
-               break;
-       };
+       smp4m_boot_cpus();
 }
 
-/* Set this up early so that things like the scheduler can init
- * properly.  We use the same cpu mask for both the present and
- * possible cpu map.
- */
-void __init smp_setup_cpu_possible_map(void)
-{
-       int instance, mid;
-
-       instance = 0;
-       while (!cpu_find_by_instance(instance, NULL, &mid)) {
-               if (mid < NR_CPUS) {
-                       cpu_set(mid, phys_cpu_present_map);
-                       cpu_set(mid, cpu_present_map);
-               }
-               instance++;
-       }
-}
-
-void __init smp_prepare_boot_cpu(void)
+void __devinit smp_prepare_boot_cpu(void)
 {
        int cpuid = hard_smp_processor_id();
 
@@ -373,40 +306,12 @@ void __init smp_prepare_boot_cpu(void)
        cpu_set(cpuid, phys_cpu_present_map);
 }
 
-int __cpuinit __cpu_up(unsigned int cpu)
+int __devinit __cpu_up(unsigned int cpu)
 {
        extern int smp4m_boot_one_cpu(int);
-       extern int smp4d_boot_one_cpu(int);
-       int ret=0;
-
-       switch(sparc_cpu_model) {
-       case sun4:
-               printk("SUN4\n");
-               BUG();
-               break;
-       case sun4c:
-               printk("SUN4C\n");
-               BUG();
-               break;
-       case sun4m:
-               ret = smp4m_boot_one_cpu(cpu);
-               break;
-       case sun4d:
-               ret = smp4d_boot_one_cpu(cpu);
-               break;
-       case sun4e:
-               printk("SUN4E\n");
-               BUG();
-               break;
-       case sun4u:
-               printk("SUN4U\n");
-               BUG();
-               break;
-       default:
-               printk("UNKNOWN!\n");
-               BUG();
-               break;
-       };
+       int ret;
+
+       ret = smp4m_boot_one_cpu(cpu);
 
        if (!ret) {
                cpu_set(cpu, smp_commenced_mask);