diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-05-20 07:36:52 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-05-20 07:36:52 +0200 |
| commit | 880102e78547c1db158a17e36cf0cdd98e7ad710 (patch) | |
| tree | 3fff9cc54c44dafe275cfabefb96c589e08d971d /arch/blackfin/mach-common/smp.c | |
| parent | Merge remote branch 'kumar/next' into next (diff) | |
| parent | Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| download | linux-880102e78547c1db158a17e36cf0cdd98e7ad710.tar.xz linux-880102e78547c1db158a17e36cf0cdd98e7ad710.zip | |
Merge remote branch 'origin/master' into merge
Manual merge of arch/powerpc/kernel/smp.c and add missing scheduler_ipi()
call to arch/powerpc/platforms/cell/interrupt.c
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/blackfin/mach-common/smp.c')
| -rw-r--r-- | arch/blackfin/mach-common/smp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/blackfin/mach-common/smp.c b/arch/blackfin/mach-common/smp.c index 8bce5ed031e4..1fbd94c44457 100644 --- a/arch/blackfin/mach-common/smp.c +++ b/arch/blackfin/mach-common/smp.c @@ -177,6 +177,9 @@ static irqreturn_t ipi_handler_int1(int irq, void *dev_instance) while (msg_queue->count) { msg = &msg_queue->ipi_message[msg_queue->head]; switch (msg->type) { + case BFIN_IPI_RESCHEDULE: + scheduler_ipi(); + break; case BFIN_IPI_CALL_FUNC: spin_unlock_irqrestore(&msg_queue->lock, flags); ipi_call_function(cpu, msg); |