Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

2 files changed, 20 insertions, 43 deletions

diff --git a/arch/mips/sibyte/sb1250/irq.c b/arch/mips/sibyte/sb1250/irq.c
index 12ac04a658ee..be4460a5f6a8 100644
--- a/arch/mips/sibyte/sb1250/irq.c
+++ b/arch/mips/sibyte/sb1250/irq.c
@@ -43,31 +43,10 @@
  * for interrupt lines
  */
 
-
-static void end_sb1250_irq(unsigned int irq);
-static void enable_sb1250_irq(unsigned int irq);
-static void disable_sb1250_irq(unsigned int irq);
-static void ack_sb1250_irq(unsigned int irq);
-#ifdef CONFIG_SMP
-static int sb1250_set_affinity(unsigned int irq, const struct cpumask *mask);
-#endif
-
 #ifdef CONFIG_SIBYTE_HAS_LDT
 extern unsigned long ldt_eoi_space;
 #endif
 
-static struct irq_chip sb1250_irq_type = {
-        .name = "SB1250-IMR",
-        .ack = ack_sb1250_irq,
-        .mask = disable_sb1250_irq,
-        .mask_ack = ack_sb1250_irq,
-        .unmask = enable_sb1250_irq,
-        .end = end_sb1250_irq,
-#ifdef CONFIG_SMP
-        .set_affinity = sb1250_set_affinity
-#endif
-};
-
 /* Store the CPU id (not the logical number) */
 int sb1250_irq_owner[SB1250_NR_IRQS];
 
@@ -102,9 +81,11 @@ void sb1250_unmask_irq(int cpu, int irq)
 }
 
 #ifdef CONFIG_SMP
-static int sb1250_set_affinity(unsigned int irq, const struct cpumask *mask)
+static int sb1250_set_affinity(struct irq_data *d, const struct cpumask *mask,
+                               bool force)
 {
         int i = 0, old_cpu, cpu, int_on;
+        unsigned int irq = d->irq;
         u64 cur_ints;
         unsigned long flags;
 
@@ -142,21 +123,17 @@ static int sb1250_set_affinity(unsigned int irq, const struct cpumask *mask)
 }
 #endif
 
-/*****************************************************************************/
-
-static void disable_sb1250_irq(unsigned int irq)
+static void enable_sb1250_irq(struct irq_data *d)
 {
-        sb1250_mask_irq(sb1250_irq_owner[irq], irq);
-}
+        unsigned int irq = d->irq;
 
-static void enable_sb1250_irq(unsigned int irq)
-{
         sb1250_unmask_irq(sb1250_irq_owner[irq], irq);
 }
 
 
-static void ack_sb1250_irq(unsigned int irq)
+static void ack_sb1250_irq(struct irq_data *d)
 {
+        unsigned int irq = d->irq;
 #ifdef CONFIG_SIBYTE_HAS_LDT
         u64 pending;
 
@@ -199,21 +176,22 @@ static void ack_sb1250_irq(unsigned int irq)
         sb1250_mask_irq(sb1250_irq_owner[irq], irq);
 }
 
-
-static void end_sb1250_irq(unsigned int irq)
-{
-        if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) {
-                sb1250_unmask_irq(sb1250_irq_owner[irq], irq);
-        }
-}
-
+static struct irq_chip sb1250_irq_type = {
+        .name = "SB1250-IMR",
+        .irq_mask_ack = ack_sb1250_irq,
+        .irq_unmask = enable_sb1250_irq,
+#ifdef CONFIG_SMP
+        .irq_set_affinity = sb1250_set_affinity
+#endif
+};
 
 void __init init_sb1250_irqs(void)
 {
         int i;
 
         for (i = 0; i < SB1250_NR_IRQS; i++) {
-                set_irq_chip_and_handler(i, &sb1250_irq_type, handle_level_irq);
+                irq_set_chip_and_handler(i, &sb1250_irq_type,
+                                         handle_level_irq);
                 sb1250_irq_owner[i] = 0;
         }
 }
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();