1 files changed, 6 insertions, 1 deletions

diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
index 574cd205b302..eeb2ae5ffc58 100644
--- a/arch/powerpc/platforms/powermac/smp.c
+++ b/arch/powerpc/platforms/powermac/smp.c
@@ -328,6 +328,7 @@ static void __init smp_psurge_kick_cpu(int nr)
 {
         unsigned long start = __pa(__secondary_start_pmac_0) + nr * 8;
         unsigned long a;
+        int i;
 
         /* may need to flush here if secondary bats aren't setup */
         for (a = KERNELBASE; a < KERNELBASE + 0x800000; a += 32)
@@ -340,7 +341,11 @@ static void __init smp_psurge_kick_cpu(int nr)
         mb();
 
         psurge_set_ipi(nr);
-        udelay(10);
+        /*
+         * We can't use udelay here because the timebase is now frozen.
+         */
+        for (i = 0; i < 2000; ++i)
+                barrier();
         psurge_clr_ipi(nr);
 
         if (ppc_md.progress) ppc_md.progress("smp_psurge_kick_cpu - done", 0x354);