diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-10-30 10:26:11 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-10-30 10:26:11 +0000 |
| commit | 2231b3729eb92f163bbe64b604410ee451b2c42b (patch) | |
| tree | 4b4043cda9bfcf0912839edbb64484763853bd33 /arch/mips/kernel/smp.c | |
| parent | b99053eefce89c5c8500517f5f065c85b57d98ee (diff) | |
| parent | e946217e4fdaa67681bbabfa8e6b18641921f750 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c64xx
Diffstat (limited to 'arch/mips/kernel/smp.c')
| -rw-r--r-- | arch/mips/kernel/smp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c index 7b59cfb7e60..b79ea7055ec 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) |