This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / kernel / stop_machine.c

diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c
index 2ceea25..9610403 100644 (file)
--- a/kernel/stop_machine.c
+++ b/kernel/stop_machine.c
@@ -52,12 +52,7 @@ static int stopmachine(void *cpu)
                        mb(); /* Must read state first. */
                        atomic_inc(&stopmachine_thread_ack);
                }
-               /* Yield in first stage: migration threads need to
-                * help our sisters onto their CPUs. */
-               if (!prepared && !irqs_disabled)
-                       yield();
-               else
-                       cpu_relax();
+               cpu_relax();
        }
 
        /* Ack: we are exiting. */