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

Conflicts:
	litmus/sched_cedf.c

1 files changed, 61 insertions, 69 deletions

diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index 517d50ddbeb3..9c49a46a2b7a 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -185,14 +185,6 @@ static struct sa1111_dev_info sa1111_devices[] = {
         },
 };
 
-void __init sa1111_adjust_zones(unsigned long *size, unsigned long *holes)
-{
-        unsigned int sz = SZ_1M >> PAGE_SHIFT;
-
-        size[1] = size[0] - sz;
-        size[0] = sz;
-}
-
 /*
  * SA1111 interrupt support.  Since clearing an IRQ while there are
  * active IRQs causes the interrupt output to pulse, the upper levels
@@ -202,7 +194,7 @@ static void
 sa1111_irq_handler(unsigned int irq, struct irq_desc *desc)
 {
         unsigned int stat0, stat1, i;
-        struct sa1111 *sachip = get_irq_data(irq);
+        struct sa1111 *sachip = irq_get_handler_data(irq);
         void __iomem *mapbase = sachip->base + SA1111_INTC;
 
         stat0 = sa1111_readl(mapbase + SA1111_INTSTATCLR0);
@@ -210,7 +202,7 @@ sa1111_irq_handler(unsigned int irq, struct irq_desc *desc)
 
         sa1111_writel(stat0, mapbase + SA1111_INTSTATCLR0);
 
-        desc->chip->ack(irq);
+        desc->irq_data.chip->irq_ack(&desc->irq_data);
 
         sa1111_writel(stat1, mapbase + SA1111_INTSTATCLR1);
 
@@ -228,35 +220,35 @@ sa1111_irq_handler(unsigned int irq, struct irq_desc *desc)
                         generic_handle_irq(i + sachip->irq_base);
 
         /* For level-based interrupts */
-        desc->chip->unmask(irq);
+        desc->irq_data.chip->irq_unmask(&desc->irq_data);
 }
 
 #define SA1111_IRQMASK_LO(x)    (1 << (x - sachip->irq_base))
 #define SA1111_IRQMASK_HI(x)    (1 << (x - sachip->irq_base - 32))
 
-static void sa1111_ack_irq(unsigned int irq)
+static void sa1111_ack_irq(struct irq_data *d)
 {
 }
 
-static void sa1111_mask_lowirq(unsigned int irq)
+static void sa1111_mask_lowirq(struct irq_data *d)
 {
-        struct sa1111 *sachip = get_irq_chip_data(irq);
+        struct sa1111 *sachip = irq_data_get_irq_chip_data(d);
         void __iomem *mapbase = sachip->base + SA1111_INTC;
         unsigned long ie0;
 
         ie0 = sa1111_readl(mapbase + SA1111_INTEN0);
-        ie0 &= ~SA1111_IRQMASK_LO(irq);
+        ie0 &= ~SA1111_IRQMASK_LO(d->irq);
         writel(ie0, mapbase + SA1111_INTEN0);
 }
 
-static void sa1111_unmask_lowirq(unsigned int irq)
+static void sa1111_unmask_lowirq(struct irq_data *d)
 {
-        struct sa1111 *sachip = get_irq_chip_data(irq);
+        struct sa1111 *sachip = irq_data_get_irq_chip_data(d);
         void __iomem *mapbase = sachip->base + SA1111_INTC;
         unsigned long ie0;
 
         ie0 = sa1111_readl(mapbase + SA1111_INTEN0);
-        ie0 |= SA1111_IRQMASK_LO(irq);
+        ie0 |= SA1111_IRQMASK_LO(d->irq);
         sa1111_writel(ie0, mapbase + SA1111_INTEN0);
 }
 
@@ -267,11 +259,11 @@ static void sa1111_unmask_lowirq(unsigned int irq)
  * be triggered.  In fact, its very difficult, if not impossible to get
  * INTSET to re-trigger the interrupt.
  */
-static int sa1111_retrigger_lowirq(unsigned int irq)
+static int sa1111_retrigger_lowirq(struct irq_data *d)
 {
-        struct sa1111 *sachip = get_irq_chip_data(irq);
+        struct sa1111 *sachip = irq_data_get_irq_chip_data(d);
         void __iomem *mapbase = sachip->base + SA1111_INTC;
-        unsigned int mask = SA1111_IRQMASK_LO(irq);
+        unsigned int mask = SA1111_IRQMASK_LO(d->irq);
         unsigned long ip0;
         int i;
 
@@ -279,21 +271,21 @@ static int sa1111_retrigger_lowirq(unsigned int irq)
         for (i = 0; i < 8; i++) {
                 sa1111_writel(ip0 ^ mask, mapbase + SA1111_INTPOL0);
                 sa1111_writel(ip0, mapbase + SA1111_INTPOL0);
-                if (sa1111_readl(mapbase + SA1111_INTSTATCLR1) & mask)
+                if (sa1111_readl(mapbase + SA1111_INTSTATCLR0) & mask)
                         break;
         }
 
         if (i == 8)
                 printk(KERN_ERR "Danger Will Robinson: failed to "
-                        "re-trigger IRQ%d\n", irq);
+                        "re-trigger IRQ%d\n", d->irq);
         return i == 8 ? -1 : 0;
 }
 
-static int sa1111_type_lowirq(unsigned int irq, unsigned int flags)
+static int sa1111_type_lowirq(struct irq_data *d, unsigned int flags)
 {
-        struct sa1111 *sachip = get_irq_chip_data(irq);
+        struct sa1111 *sachip = irq_data_get_irq_chip_data(d);
         void __iomem *mapbase = sachip->base + SA1111_INTC;
-        unsigned int mask = SA1111_IRQMASK_LO(irq);
+        unsigned int mask = SA1111_IRQMASK_LO(d->irq);
         unsigned long ip0;
 
         if (flags == IRQ_TYPE_PROBE)
@@ -313,11 +305,11 @@ static int sa1111_type_lowirq(unsigned int irq, unsigned int flags)
         return 0;
 }
 
-static int sa1111_wake_lowirq(unsigned int irq, unsigned int on)
+static int sa1111_wake_lowirq(struct irq_data *d, unsigned int on)
 {
-        struct sa1111 *sachip = get_irq_chip_data(irq);
+        struct sa1111 *sachip = irq_data_get_irq_chip_data(d);
         void __iomem *mapbase = sachip->base + SA1111_INTC;
-        unsigned int mask = SA1111_IRQMASK_LO(irq);
+        unsigned int mask = SA1111_IRQMASK_LO(d->irq);
         unsigned long we0;
 
         we0 = sa1111_readl(mapbase + SA1111_WAKEEN0);
@@ -332,33 +324,33 @@ static int sa1111_wake_lowirq(unsigned int irq, unsigned int on)
 
 static struct irq_chip sa1111_low_chip = {
         .name           = "SA1111-l",
-        .ack            = sa1111_ack_irq,
-        .mask           = sa1111_mask_lowirq,
-        .unmask         = sa1111_unmask_lowirq,
-        .retrigger      = sa1111_retrigger_lowirq,
-        .set_type       = sa1111_type_lowirq,
-        .set_wake       = sa1111_wake_lowirq,
+        .irq_ack        = sa1111_ack_irq,
+        .irq_mask       = sa1111_mask_lowirq,
+        .irq_unmask     = sa1111_unmask_lowirq,
+        .irq_retrigger  = sa1111_retrigger_lowirq,
+        .irq_set_type   = sa1111_type_lowirq,
+        .irq_set_wake   = sa1111_wake_lowirq,
 };
 
-static void sa1111_mask_highirq(unsigned int irq)
+static void sa1111_mask_highirq(struct irq_data *d)
 {
-        struct sa1111 *sachip = get_irq_chip_data(irq);
+        struct sa1111 *sachip = irq_data_get_irq_chip_data(d);
         void __iomem *mapbase = sachip->base + SA1111_INTC;
         unsigned long ie1;
 
         ie1 = sa1111_readl(mapbase + SA1111_INTEN1);
-        ie1 &= ~SA1111_IRQMASK_HI(irq);
+        ie1 &= ~SA1111_IRQMASK_HI(d->irq);
         sa1111_writel(ie1, mapbase + SA1111_INTEN1);
 }
 
-static void sa1111_unmask_highirq(unsigned int irq)
+static void sa1111_unmask_highirq(struct irq_data *d)
 {
-        struct sa1111 *sachip = get_irq_chip_data(irq);
+        struct sa1111 *sachip = irq_data_get_irq_chip_data(d);
         void __iomem *mapbase = sachip->base + SA1111_INTC;
         unsigned long ie1;
 
         ie1 = sa1111_readl(mapbase + SA1111_INTEN1);
-        ie1 |= SA1111_IRQMASK_HI(irq);
+        ie1 |= SA1111_IRQMASK_HI(d->irq);
         sa1111_writel(ie1, mapbase + SA1111_INTEN1);
 }
 
@@ -369,11 +361,11 @@ static void sa1111_unmask_highirq(unsigned int irq)
  * be triggered.  In fact, its very difficult, if not impossible to get
  * INTSET to re-trigger the interrupt.
  */
-static int sa1111_retrigger_highirq(unsigned int irq)
+static int sa1111_retrigger_highirq(struct irq_data *d)
 {
-        struct sa1111 *sachip = get_irq_chip_data(irq);
+        struct sa1111 *sachip = irq_data_get_irq_chip_data(d);
         void __iomem *mapbase = sachip->base + SA1111_INTC;
-        unsigned int mask = SA1111_IRQMASK_HI(irq);
+        unsigned int mask = SA1111_IRQMASK_HI(d->irq);
         unsigned long ip1;
         int i;
 
@@ -387,15 +379,15 @@ static int sa1111_retrigger_highirq(unsigned int irq)
 
         if (i == 8)
                 printk(KERN_ERR "Danger Will Robinson: failed to "
-                        "re-trigger IRQ%d\n", irq);
+                        "re-trigger IRQ%d\n", d->irq);
         return i == 8 ? -1 : 0;
 }
 
-static int sa1111_type_highirq(unsigned int irq, unsigned int flags)
+static int sa1111_type_highirq(struct irq_data *d, unsigned int flags)
 {
-        struct sa1111 *sachip = get_irq_chip_data(irq);
+        struct sa1111 *sachip = irq_data_get_irq_chip_data(d);
         void __iomem *mapbase = sachip->base + SA1111_INTC;
-        unsigned int mask = SA1111_IRQMASK_HI(irq);
+        unsigned int mask = SA1111_IRQMASK_HI(d->irq);
         unsigned long ip1;
 
         if (flags == IRQ_TYPE_PROBE)
@@ -415,11 +407,11 @@ static int sa1111_type_highirq(unsigned int irq, unsigned int flags)
         return 0;
 }
 
-static int sa1111_wake_highirq(unsigned int irq, unsigned int on)
+static int sa1111_wake_highirq(struct irq_data *d, unsigned int on)
 {
-        struct sa1111 *sachip = get_irq_chip_data(irq);
+        struct sa1111 *sachip = irq_data_get_irq_chip_data(d);
         void __iomem *mapbase = sachip->base + SA1111_INTC;
-        unsigned int mask = SA1111_IRQMASK_HI(irq);
+        unsigned int mask = SA1111_IRQMASK_HI(d->irq);
         unsigned long we1;
 
         we1 = sa1111_readl(mapbase + SA1111_WAKEEN1);
@@ -434,12 +426,12 @@ static int sa1111_wake_highirq(unsigned int irq, unsigned int on)
 
 static struct irq_chip sa1111_high_chip = {
         .name           = "SA1111-h",
-        .ack            = sa1111_ack_irq,
-        .mask           = sa1111_mask_highirq,
-        .unmask         = sa1111_unmask_highirq,
-        .retrigger      = sa1111_retrigger_highirq,
-        .set_type       = sa1111_type_highirq,
-        .set_wake       = sa1111_wake_highirq,
+        .irq_ack        = sa1111_ack_irq,
+        .irq_mask       = sa1111_mask_highirq,
+        .irq_unmask     = sa1111_unmask_highirq,
+        .irq_retrigger  = sa1111_retrigger_highirq,
+        .irq_set_type   = sa1111_type_highirq,
+        .irq_set_wake   = sa1111_wake_highirq,
 };
 
 static void sa1111_setup_irq(struct sa1111 *sachip)
@@ -472,25 +464,25 @@ static void sa1111_setup_irq(struct sa1111 *sachip)
         sa1111_writel(~0, irqbase + SA1111_INTSTATCLR1);
 
         for (irq = IRQ_GPAIN0; irq <= SSPROR; irq++) {
-                set_irq_chip(irq, &sa1111_low_chip);
-                set_irq_chip_data(irq, sachip);
-                set_irq_handler(irq, handle_edge_irq);
+                irq_set_chip_and_handler(irq, &sa1111_low_chip,
+                                         handle_edge_irq);
+                irq_set_chip_data(irq, sachip);
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
 
         for (irq = AUDXMTDMADONEA; irq <= IRQ_S1_BVD1_STSCHG; irq++) {
-                set_irq_chip(irq, &sa1111_high_chip);
-                set_irq_chip_data(irq, sachip);
-                set_irq_handler(irq, handle_edge_irq);
+                irq_set_chip_and_handler(irq, &sa1111_high_chip,
+                                         handle_edge_irq);
+                irq_set_chip_data(irq, sachip);
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
 
         /*
          * Register SA1111 interrupt
          */
-        set_irq_type(sachip->irq, IRQ_TYPE_EDGE_RISING);
-        set_irq_data(sachip->irq, sachip);
-        set_irq_chained_handler(sachip->irq, sa1111_irq_handler);
+        irq_set_irq_type(sachip->irq, IRQ_TYPE_EDGE_RISING);
+        irq_set_handler_data(sachip->irq, sachip);
+        irq_set_chained_handler(sachip->irq, sa1111_irq_handler);
 }
 
 /*
@@ -678,7 +670,7 @@ out:
  *      %-EBUSY         physical address already marked in-use.
  *      %0              successful.
  */
-static int
+static int __devinit
 __sa1111_probe(struct device *me, struct resource *mem, int irq)
 {
         struct sa1111 *sachip;
@@ -815,8 +807,8 @@ static void __sa1111_remove(struct sa1111 *sachip)
         clk_disable(sachip->clk);
 
         if (sachip->irq != NO_IRQ) {
-                set_irq_chained_handler(sachip->irq, NULL);
-                set_irq_data(sachip->irq, NULL);
+                irq_set_chained_handler(sachip->irq, NULL);
+                irq_set_handler_data(sachip->irq, NULL);
 
                 release_mem_region(sachip->phys + SA1111_INTC, 512);
         }