1 files changed, 9 insertions, 6 deletions

diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 0b47de07302d..d387b3937ccc 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -269,7 +269,10 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
         cpu_callin_map[boot_cpuid] = 1;
 
         if (smp_ops)
-                max_cpus = smp_ops->probe();
+                if (smp_ops->probe)
+                        max_cpus = smp_ops->probe();
+                else
+                        max_cpus = NR_CPUS;
         else
                 max_cpus = 1;
  
@@ -412,9 +415,8 @@ int __cpuinit __cpu_up(unsigned int cpu)
                  * CPUs can take much longer to come up in the
                  * hotplug case.  Wait five seconds.
                  */
-                for (c = 25; c && !cpu_callin_map[cpu]; c--) {
-                        msleep(200);
-                }
+                for (c = 5000; c && !cpu_callin_map[cpu]; c--)
+                        msleep(1);
 #endif
 
         if (!cpu_callin_map[cpu]) {
@@ -494,7 +496,8 @@ int __devinit start_secondary(void *unused)
         preempt_disable();
         cpu_callin_map[cpu] = 1;
 
-        smp_ops->setup_cpu(cpu);
+        if (smp_ops->setup_cpu)
+                smp_ops->setup_cpu(cpu);
         if (smp_ops->take_timebase)
                 smp_ops->take_timebase();
 
@@ -557,7 +560,7 @@ void __init smp_cpus_done(unsigned int max_cpus)
         old_mask = current->cpus_allowed;
         set_cpus_allowed(current, cpumask_of_cpu(boot_cpuid));
         
-        if (smp_ops)
+        if (smp_ops && smp_ops->setup_cpu)
                 smp_ops->setup_cpu(boot_cpuid);
 
         set_cpus_allowed(current, old_mask);