aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel/smp.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2008-10-18 13:23:10 +0100
committerRalf Baechle <ralf@linux-mips.org>2008-10-27 16:18:26 +0000
commit7920c4d658ff2b0f7b8acf3bd7c700875c2bc163 (patch)
tree102ac4fd260329c49eaa94491413658c647e95a0 /arch/mips/kernel/smp.c
parentMIPS: Don't unmap the memory for dma_sync*. (diff)
downloadlinux-dev-7920c4d658ff2b0f7b8acf3bd7c700875c2bc163.tar.xz
linux-dev-7920c4d658ff2b0f7b8acf3bd7c700875c2bc163.zip
MIPS: SMP: Don't reenable interrupts in stop_this_cpu; use WAIT instruction.
Noticed by Anirban Sinha <ASinha@zeugmasystems.com>; patch by me. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to '')
-rw-r--r--arch/mips/kernel/smp.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index 7b59cfb7e602..b79ea7055ec3 100644
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -163,8 +163,10 @@ static void stop_this_cpu(void *dummy)
* Remove this CPU:
*/
cpu_clear(smp_processor_id(), cpu_online_map);
- local_irq_enable(); /* May need to service _machine_restart IPI */
- for (;;); /* Wait if available. */
+ for (;;) {
+ if (cpu_wait)
+ (*cpu_wait)(); /* Wait if available. */
+ }
}
void smp_send_stop(void)