diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-04-18 14:53:18 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-04-18 14:53:33 +0200 |
| commit | 6ddafdaab3f809b110ada253d2f2d4910ebd3ac5 (patch) | |
| tree | 366bb7513511a05b6e11ab89bfe3b2dbd1d62a03 /arch/mips/sibyte/sb1250/smp.c | |
| parent | 3905c54f2bd2c6f937f87307987ca072eabc3e7b (diff) | |
| parent | bd8e7dded88a3e1c085c333f19ff31387616f71a (diff) | |
Merge branch 'sched/locking' into sched/core
Merge reason: the rq locking changes are stable,
propagate them into the .40 queue.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/mips/sibyte/sb1250/smp.c')
| -rw-r--r-- | arch/mips/sibyte/sb1250/smp.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/mips/sibyte/sb1250/smp.c b/arch/mips/sibyte/sb1250/smp.c index c00a5cb1128d..38e7f6bd7922 100644 --- a/arch/mips/sibyte/sb1250/smp.c +++ b/arch/mips/sibyte/sb1250/smp.c @@ -21,6 +21,7 @@ #include <linux/interrupt.h> #include <linux/smp.h> #include <linux/kernel_stat.h> +#include <linux/sched.h> #include <asm/mmu_context.h> #include <asm/io.h> @@ -177,10 +178,8 @@ void sb1250_mailbox_interrupt(void) /* Clear the mailbox to clear the interrupt */ ____raw_writeq(((u64)action) << 48, mailbox_clear_regs[cpu]); - /* - * Nothing to do for SMP_RESCHEDULE_YOURSELF; returning from the - * interrupt will do the reschedule for us - */ + if (action & SMP_RESCHEDULE_YOURSELF) + scheduler_ipi(); if (action & SMP_CALL_FUNCTION) smp_call_function_interrupt(); |