diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2008-06-04 10:26:59 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2008-06-04 10:26:59 +0200 |
| commit | f38bb7de289f5c15e287386d35e9c325f1062c49 (patch) | |
| tree | 38e69a9ecea18243e3f66bcf51bc89cd7b8f0c94 /kernel/stop_machine.c | |
| parent | 2d4b3f37ded8998a362c8d0b4be02f583dd9a002 (diff) | |
| parent | c3b25b32e8bef526cca748e1ba023c6bdd705a99 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'kernel/stop_machine.c')
| -rw-r--r-- | kernel/stop_machine.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c index 0101aeef7ed..b7350bbfb07 100644 --- a/kernel/stop_machine.c +++ b/kernel/stop_machine.c @@ -62,8 +62,7 @@ static int stopmachine(void *cpu) * help our sisters onto their CPUs. */ if (!prepared && !irqs_disabled) yield(); - else - cpu_relax(); + cpu_relax(); } /* Ack: we are exiting. */ @@ -106,8 +105,10 @@ static int stop_machine(void) } /* Wait for them all to come to life. */ - while (atomic_read(&stopmachine_thread_ack) != stopmachine_num_threads) + while (atomic_read(&stopmachine_thread_ack) != stopmachine_num_threads) { yield(); + cpu_relax(); + } /* If some failed, kill them all. */ if (ret < 0) { |