MIPS: SMP: Allow boot_secondary SMP op to return errors

[sfrench/cifs-2.6.git] / arch / mips / cavium-octeon / smp.c

diff --git a/arch/mips/cavium-octeon/smp.c b/arch/mips/cavium-octeon/smp.c
index 163663a5363de3dc455751ddc4d2f6dda19782c9..75e7c862565983b34f6cc127332f6e8b0f5832c7 100644 (file)
--- a/arch/mips/cavium-octeon/smp.c
+++ b/arch/mips/cavium-octeon/smp.c
@@ -205,7 +205,7 @@ int plat_post_relocation(long offset)
  * Firmware CPU startup hook
  *
  */
-static void octeon_boot_secondary(int cpu, struct task_struct *idle)
+static int octeon_boot_secondary(int cpu, struct task_struct *idle)
 {
        int count;
 
@@ -223,8 +223,12 @@ static void octeon_boot_secondary(int cpu, struct task_struct *idle)
                udelay(1);
                count--;
        }
-       if (count == 0)
+       if (count == 0) {
                pr_err("Secondary boot timeout\n");
+               return -ETIMEDOUT;
+       }
+
+       return 0;
 }
 
 /**