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

Conflicts:
	litmus/sched_cedf.c

1 files changed, 17 insertions, 24 deletions

diff --git a/arch/powerpc/sysdev/mpc8xx_pic.c b/arch/powerpc/sysdev/mpc8xx_pic.c
index 8c27d261aba8..20924f2246f0 100644
--- a/arch/powerpc/sysdev/mpc8xx_pic.c
+++ b/arch/powerpc/sysdev/mpc8xx_pic.c
@@ -25,10 +25,10 @@ static sysconf8xx_t __iomem *siu_reg;
 
 int cpm_get_irq(struct pt_regs *regs);
 
-static void mpc8xx_unmask_irq(unsigned int virq)
+static void mpc8xx_unmask_irq(struct irq_data *d)
 {
         int     bit, word;
-        unsigned int irq_nr = (unsigned int)irq_map[virq].hwirq;
+        unsigned int irq_nr = (unsigned int)irqd_to_hwirq(d);
 
         bit = irq_nr & 0x1f;
         word = irq_nr >> 5;
@@ -37,10 +37,10 @@ static void mpc8xx_unmask_irq(unsigned int virq)
         out_be32(&siu_reg->sc_simask, ppc_cached_irq_mask[word]);
 }
 
-static void mpc8xx_mask_irq(unsigned int virq)
+static void mpc8xx_mask_irq(struct irq_data *d)
 {
         int     bit, word;
-        unsigned int irq_nr = (unsigned int)irq_map[virq].hwirq;
+        unsigned int irq_nr = (unsigned int)irqd_to_hwirq(d);
 
         bit = irq_nr & 0x1f;
         word = irq_nr >> 5;
@@ -49,19 +49,19 @@ static void mpc8xx_mask_irq(unsigned int virq)
         out_be32(&siu_reg->sc_simask, ppc_cached_irq_mask[word]);
 }
 
-static void mpc8xx_ack(unsigned int virq)
+static void mpc8xx_ack(struct irq_data *d)
 {
         int     bit;
-        unsigned int irq_nr = (unsigned int)irq_map[virq].hwirq;
+        unsigned int irq_nr = (unsigned int)irqd_to_hwirq(d);
 
         bit = irq_nr & 0x1f;
         out_be32(&siu_reg->sc_sipend, 1 << (31-bit));
 }
 
-static void mpc8xx_end_irq(unsigned int virq)
+static void mpc8xx_end_irq(struct irq_data *d)
 {
         int bit, word;
-        unsigned int irq_nr = (unsigned int)irq_map[virq].hwirq;
+        unsigned int irq_nr = (unsigned int)irqd_to_hwirq(d);
 
         bit = irq_nr & 0x1f;
         word = irq_nr >> 5;
@@ -70,24 +70,17 @@ static void mpc8xx_end_irq(unsigned int virq)
         out_be32(&siu_reg->sc_simask, ppc_cached_irq_mask[word]);
 }
 
-static int mpc8xx_set_irq_type(unsigned int virq, unsigned int flow_type)
+static int mpc8xx_set_irq_type(struct irq_data *d, unsigned int flow_type)
 {
-        struct irq_desc *desc = irq_to_desc(virq);
-
-        desc->status &= ~(IRQ_TYPE_SENSE_MASK | IRQ_LEVEL);
-        desc->status |= flow_type & IRQ_TYPE_SENSE_MASK;
-        if (flow_type & (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW))
-                desc->status |= IRQ_LEVEL;
-
         if (flow_type & IRQ_TYPE_EDGE_FALLING) {
-                irq_hw_number_t hw = (unsigned int)irq_map[virq].hwirq;
+                irq_hw_number_t hw = (unsigned int)irqd_to_hwirq(d);
                 unsigned int siel = in_be32(&siu_reg->sc_siel);
 
                 /* only external IRQ senses are programmable */
                 if ((hw & 1) == 0) {
                         siel |= (0x80000000 >> hw);
                         out_be32(&siu_reg->sc_siel, siel);
-                        desc->handle_irq = handle_edge_irq;
+                        __irq_set_handler_locked(d->irq, handle_edge_irq);
                 }
         }
         return 0;
@@ -95,11 +88,11 @@ static int mpc8xx_set_irq_type(unsigned int virq, unsigned int flow_type)
 
 static struct irq_chip mpc8xx_pic = {
         .name = "MPC8XX SIU",
-        .unmask = mpc8xx_unmask_irq,
-        .mask = mpc8xx_mask_irq,
-        .ack = mpc8xx_ack,
-        .eoi = mpc8xx_end_irq,
-        .set_type = mpc8xx_set_irq_type,
+        .irq_unmask = mpc8xx_unmask_irq,
+        .irq_mask = mpc8xx_mask_irq,
+        .irq_ack = mpc8xx_ack,
+        .irq_eoi = mpc8xx_end_irq,
+        .irq_set_type = mpc8xx_set_irq_type,
 };
 
 unsigned int mpc8xx_get_irq(void)
@@ -124,7 +117,7 @@ static int mpc8xx_pic_host_map(struct irq_host *h, unsigned int virq,
         pr_debug("mpc8xx_pic_host_map(%d, 0x%lx)\n", virq, hw);
 
         /* Set default irq handle */
-        set_irq_chip_and_handler(virq, &mpc8xx_pic, handle_level_irq);
+        irq_set_chip_and_handler(virq, &mpc8xx_pic, handle_level_irq);
         return 0;
 }