Merge tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux

Pull blackfin updates from Steven Miao:
 "blackfin updates for Linux 3.11"

* tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux:
  smp: refine bf561 smpboot code
  bf609: stmmac: fix build after stmmac_mdio_bus_data changed
  bf609: add cpu revision 0.1
  bf609: rename bfin6xx_spi to bfin_spi3
  kgdb: blackfin: include irq_regs.h in kgdb.c

1 files changed, 3 insertions, 4 deletions

diff --git a/arch/blackfin/mach-bf561/smp.c b/arch/blackfin/mach-bf561/smp.c
index ab1c617b9cfc..c77a23bc9de3 100644
--- a/arch/blackfin/mach-bf561/smp.c
+++ b/arch/blackfin/mach-bf561/smp.c
@@ -69,7 +69,6 @@ void __cpuinit platform_secondary_init(unsigned int cpu)
         SSYNC();
 
         /* We are done with local CPU inits, unblock the boot CPU. */
-        set_cpu_online(cpu, true);
         spin_lock(&boot_lock);
         spin_unlock(&boot_lock);
 }
@@ -91,7 +90,9 @@ int __cpuinit platform_boot_secondary(unsigned int cpu, struct task_struct *idle
                 SSYNC();
         }
 
-        timeout = jiffies + 1 * HZ;
+        timeout = jiffies + HZ;
+        /* release the lock and let coreb run */
+        spin_unlock(&boot_lock);
         while (time_before(jiffies, timeout)) {
                 if (cpu_online(cpu))
                         break;
@@ -100,8 +101,6 @@ int __cpuinit platform_boot_secondary(unsigned int cpu, struct task_struct *idle
         }
 
         if (cpu_online(cpu)) {
-                /* release the lock and let coreb run */
-                spin_unlock(&boot_lock);
                 return 0;
         } else
                 panic("CPU%u: processor failed to boot\n", cpu);