diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:30:33 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:30:33 +0200 |
| commit | 48cf937f48f68bd1e61f37c6357dbff5adb95532 (patch) | |
| tree | d9e2368a419adc2c11691be2842c66213bec5a42 /kernel/stop_machine.c | |
| parent | x86: make init_ISA_irqs() static (diff) | |
| parent | Linux 2.6.26-rc8 (diff) | |
| download | wireguard-linux-48cf937f48f68bd1e61f37c6357dbff5adb95532.tar.xz wireguard-linux-48cf937f48f68bd1e61f37c6357dbff5adb95532.zip | |
Merge branch 'linus' into x86/i8259
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 0101aeef7ed7..b7350bbfb076 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) { |