42 files changed, 109 insertions, 958 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 919d8b92aaa4..f81a62380add 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -47,6 +47,18 @@ config MCA
           <file:Documentation/mca.txt> (and especially the web page given
           there) before attempting to build an MCA bus kernel.
 
+config GENERIC_HARDIRQS
+        bool
+        default y
+
+config HARDIRQS_SW_RESEND
+        bool
+        default y
+
+config GENERIC_IRQ_PROBE
+        bool
+        default y
+
 config RWSEM_GENERIC_SPINLOCK
         bool
         default y
diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c
index c02dc8116a18..f3c1ebfdd0aa 100644
--- a/arch/arm/common/gic.c
+++ b/arch/arm/common/gic.c
@@ -33,6 +33,7 @@
 
 static void __iomem *gic_dist_base;
 static void __iomem *gic_cpu_base;
+static DEFINE_SPINLOCK(irq_controller_lock);
 
 /*
  * Routines to acknowledge, disable and enable interrupts
@@ -52,32 +53,45 @@ static void __iomem *gic_cpu_base;
 static void gic_ack_irq(unsigned int irq)
 {
         u32 mask = 1 << (irq % 32);
+
+        spin_lock(&irq_controller_lock);
         writel(mask, gic_dist_base + GIC_DIST_ENABLE_CLEAR + (irq / 32) * 4);
         writel(irq, gic_cpu_base + GIC_CPU_EOI);
+        spin_unlock(&irq_controller_lock);
 }
 
 static void gic_mask_irq(unsigned int irq)
 {
         u32 mask = 1 << (irq % 32);
+
+        spin_lock(&irq_controller_lock);
         writel(mask, gic_dist_base + GIC_DIST_ENABLE_CLEAR + (irq / 32) * 4);
+        spin_unlock(&irq_controller_lock);
 }
 
 static void gic_unmask_irq(unsigned int irq)
 {
         u32 mask = 1 << (irq % 32);
+
+        spin_lock(&irq_controller_lock);
         writel(mask, gic_dist_base + GIC_DIST_ENABLE_SET + (irq / 32) * 4);
+        spin_unlock(&irq_controller_lock);
 }
 
 #ifdef CONFIG_SMP
-static void gic_set_cpu(struct irqdesc *desc, unsigned int irq, unsigned int cpu)
+static void gic_set_cpu(unsigned int irq, cpumask_t mask_val)
 {
         void __iomem *reg = gic_dist_base + GIC_DIST_TARGET + (irq & ~3);
         unsigned int shift = (irq % 4) * 8;
+        unsigned int cpu = first_cpu(mask_val);
         u32 val;
 
+        spin_lock(&irq_controller_lock);
+        irq_desc[irq].cpu = cpu;
         val = readl(reg) & ~(0xff << shift);
         val |= 1 << (cpu + shift);
         writel(val, reg);
+        spin_unlock(&irq_controller_lock);
 }
 #endif
 
@@ -86,7 +100,7 @@ static struct irqchip gic_chip = {
         .mask           = gic_mask_irq,
         .unmask         = gic_unmask_irq,
 #ifdef CONFIG_SMP
-        .set_cpu        = gic_set_cpu,
+        .set_affinity   = gic_set_cpu,
 #endif
 };
 
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index fe06a36a2130..1cdb26a47e1f 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -150,7 +150,7 @@ static void
 sa1111_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs)
 {
         unsigned int stat0, stat1, i;
-        void __iomem *base = desc->data;
+        void __iomem *base = get_irq_data(irq);
 
         stat0 = sa1111_readl(base + SA1111_INTSTATCLR0);
         stat1 = sa1111_readl(base + SA1111_INTSTATCLR1);
@@ -168,11 +168,11 @@ sa1111_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs)
 
         for (i = IRQ_SA1111_START; stat0; i++, stat0 >>= 1)
                 if (stat0 & 1)
-                        do_edge_IRQ(i, irq_desc + i, regs);
+                        handle_edge_irq(i, irq_desc + i, regs);
 
         for (i = IRQ_SA1111_START + 32; stat1; i++, stat1 >>= 1)
                 if (stat1 & 1)
-                        do_edge_IRQ(i, irq_desc + i, regs);
+                        handle_edge_irq(i, irq_desc + i, regs);
 
         /* For level-based interrupts */
         desc->chip->unmask(irq);
diff --git a/arch/arm/common/time-acorn.c b/arch/arm/common/time-acorn.c
index 486add853fb8..31b65e2231d9 100644
--- a/arch/arm/common/time-acorn.c
+++ b/arch/arm/common/time-acorn.c
@@ -16,6 +16,7 @@
 #include <linux/timex.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 
 #include <asm/hardware.h>
 #include <asm/io.h>
diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c
index 68a257666d95..ab4ad9562eee 100644
--- a/arch/arm/kernel/ecard.c
+++ b/arch/arm/kernel/ecard.c
@@ -619,7 +619,7 @@ ecard_irqexp_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *reg
                 ecard_t *ec = slot_to_ecard(slot);
 
                 if (ec->claimed) {
-                        struct irqdesc *d = irqdesc + ec->irq;
+                        struct irq_desc *d = irq_desc + ec->irq;
                         /*
                          * this ugly code is so that we can operate a
                          * prioritorising system:
diff --git a/arch/arm/kernel/fiq.c b/arch/arm/kernel/fiq.c
index 1ec3f7faa259..e8e90346f11c 100644
--- a/arch/arm/kernel/fiq.c
+++ b/arch/arm/kernel/fiq.c
@@ -38,6 +38,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/interrupt.h>
 #include <linux/seq_file.h>
 
 #include <asm/cacheflush.h>
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c
index 4d31cf8d02d5..c3d4e94ef5bf 100644
--- a/arch/arm/kernel/irq.c
+++ b/arch/arm/kernel/irq.c
@@ -26,6 +26,7 @@
 #include <linux/signal.h>
 #include <linux/ioport.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/ptrace.h>
 #include <linux/slab.h>
 #include <linux/random.h>
@@ -37,192 +38,18 @@
 #include <linux/kallsyms.h>
 #include <linux/proc_fs.h>
 
-#include <asm/irq.h>
 #include <asm/system.h>
-#include <asm/mach/irq.h>
 #include <asm/mach/time.h>
 
 /*
- * Maximum IRQ count.  Currently, this is arbitary.  However, it should
- * not be set too low to prevent false triggering.  Conversely, if it
- * is set too high, then you could miss a stuck IRQ.
- *
- * Maybe we ought to set a timer and re-enable the IRQ at a later time?
- */
-#define MAX_IRQ_CNT     100000
-
-static int noirqdebug __read_mostly;
-static volatile unsigned long irq_err_count;
-static DEFINE_SPINLOCK(irq_controller_lock);
-static LIST_HEAD(irq_pending);
-
-struct irqdesc irq_desc[NR_IRQS];
-void (*init_arch_irq)(void) __initdata = NULL;
-
-/*
  * No architecture-specific irq_finish function defined in arm/arch/irqs.h.
  */
 #ifndef irq_finish
 #define irq_finish(irq) do { } while (0)
 #endif
 
-/*
- * Dummy mask/unmask handler
- */
-void dummy_mask_unmask_irq(unsigned int irq)
-{
-}
-
-irqreturn_t no_action(int irq, void *dev_id, struct pt_regs *regs)
-{
-        return IRQ_NONE;
-}
-
-void do_bad_IRQ(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs)
-{
-        irq_err_count++;
-        printk(KERN_ERR "IRQ: spurious interrupt %d\n", irq);
-}
-
-static struct irqchip bad_chip = {
-        .ack    = dummy_mask_unmask_irq,
-        .mask   = dummy_mask_unmask_irq,
-        .unmask = dummy_mask_unmask_irq,
-};
-
-static struct irqdesc bad_irq_desc = {
-        .chip           = &bad_chip,
-        .handle         = do_bad_IRQ,
-        .pend           = LIST_HEAD_INIT(bad_irq_desc.pend),
-        .disable_depth  = 1,
-};
-
-#ifdef CONFIG_SMP
-void synchronize_irq(unsigned int irq)
-{
-        struct irqdesc *desc = irq_desc + irq;
-
-        while (desc->running)
-                barrier();
-}
-EXPORT_SYMBOL(synchronize_irq);
-
-#define smp_set_running(desc)   do { desc->running = 1; } while (0)
-#define smp_clear_running(desc) do { desc->running = 0; } while (0)
-#else
-#define smp_set_running(desc)   do { } while (0)
-#define smp_clear_running(desc) do { } while (0)
-#endif
-
-/**
- *      disable_irq_nosync - disable an irq without waiting
- *      @irq: Interrupt to disable
- *
- *      Disable the selected interrupt line.  Enables and disables
- *      are nested.  We do this lazily.
- *
- *      This function may be called from IRQ context.
- */
-void disable_irq_nosync(unsigned int irq)
-{
-        struct irqdesc *desc = irq_desc + irq;
-        unsigned long flags;
-
-        spin_lock_irqsave(&irq_controller_lock, flags);
-        desc->disable_depth++;
-        list_del_init(&desc->pend);
-        spin_unlock_irqrestore(&irq_controller_lock, flags);
-}
-EXPORT_SYMBOL(disable_irq_nosync);
-
-/**
- *      disable_irq - disable an irq and wait for completion
- *      @irq: Interrupt to disable
- *
- *      Disable the selected interrupt line.  Enables and disables
- *      are nested.  This functions waits for any pending IRQ
- *      handlers for this interrupt to complete before returning.
- *      If you use this function while holding a resource the IRQ
- *      handler may need you will deadlock.
- *
- *      This function may be called - with care - from IRQ context.
- */
-void disable_irq(unsigned int irq)
-{
-        struct irqdesc *desc = irq_desc + irq;
-
-        disable_irq_nosync(irq);
-        if (desc->action)
-                synchronize_irq(irq);
-}
-EXPORT_SYMBOL(disable_irq);
-
-/**
- *      enable_irq - enable interrupt handling on an irq
- *      @irq: Interrupt to enable
- *
- *      Re-enables the processing of interrupts on this IRQ line.
- *      Note that this may call the interrupt handler, so you may
- *      get unexpected results if you hold IRQs disabled.
- *
- *      This function may be called from IRQ context.
- */
-void enable_irq(unsigned int irq)
-{
-        struct irqdesc *desc = irq_desc + irq;
-        unsigned long flags;
-
-        spin_lock_irqsave(&irq_controller_lock, flags);
-        if (unlikely(!desc->disable_depth)) {
-                printk("enable_irq(%u) unbalanced from %p\n", irq,
-                        __builtin_return_address(0));
-        } else if (!--desc->disable_depth) {
-                desc->probing = 0;
-                desc->chip->unmask(irq);
-
-                /*
-                 * If the interrupt is waiting to be processed,
-                 * try to re-run it.  We can't directly run it
-                 * from here since the caller might be in an
-                 * interrupt-protected region.
-                 */
-                if (desc->pending && list_empty(&desc->pend)) {
-                        desc->pending = 0;
-                        if (!desc->chip->retrigger ||
-                            desc->chip->retrigger(irq))
-                                list_add(&desc->pend, &irq_pending);
-                }
-        }
-        spin_unlock_irqrestore(&irq_controller_lock, flags);
-}
-EXPORT_SYMBOL(enable_irq);
-
-/*
- * Enable wake on selected irq
- */
-void enable_irq_wake(unsigned int irq)
-{
-        struct irqdesc *desc = irq_desc + irq;
-        unsigned long flags;
-
-        spin_lock_irqsave(&irq_controller_lock, flags);
-        if (desc->chip->set_wake)
-                desc->chip->set_wake(irq, 1);
-        spin_unlock_irqrestore(&irq_controller_lock, flags);
-}
-EXPORT_SYMBOL(enable_irq_wake);
-
-void disable_irq_wake(unsigned int irq)
-{
-        struct irqdesc *desc = irq_desc + irq;
-        unsigned long flags;
-
-        spin_lock_irqsave(&irq_controller_lock, flags);
-        if (desc->chip->set_wake)
-                desc->chip->set_wake(irq, 0);
-        spin_unlock_irqrestore(&irq_controller_lock, flags);
-}
-EXPORT_SYMBOL(disable_irq_wake);
+void (*init_arch_irq)(void) __initdata = NULL;
+unsigned long irq_err_count;
 
 int show_interrupts(struct seq_file *p, void *v)
 {
@@ -242,8 +69,8 @@ int show_interrupts(struct seq_file *p, void *v)
         }
 
         if (i < NR_IRQS) {
-                spin_lock_irqsave(&irq_controller_lock, flags);
-                action = irq_desc[i].action;
+                spin_lock_irqsave(&irq_desc[i].lock, flags);
+                action = irq_desc[i].action;
                 if (!action)
                         goto unlock;
 
@@ -256,7 +83,7 @@ int show_interrupts(struct seq_file *p, void *v)
 
                 seq_putc(p, '\n');
 unlock:
-                spin_unlock_irqrestore(&irq_controller_lock, flags);
+                spin_unlock_irqrestore(&irq_desc[i].lock, flags);
         } else if (i == NR_IRQS) {
 #ifdef CONFIG_ARCH_ACORN
                 show_fiq_list(p, v);
@@ -270,267 +97,11 @@ unlock:
         return 0;
 }
 
-/*
- * IRQ lock detection.
- *
- * Hopefully, this should get us out of a few locked situations.
- * However, it may take a while for this to happen, since we need
- * a large number if IRQs to appear in the same jiffie with the
- * same instruction pointer (or within 2 instructions).
- */
-static int check_irq_lock(struct irqdesc *desc, int irq, struct pt_regs *regs)
-{
-        unsigned long instr_ptr = instruction_pointer(regs);
-
-        if (desc->lck_jif == jiffies &&
-            desc->lck_pc >= instr_ptr && desc->lck_pc < instr_ptr + 8) {
-                desc->lck_cnt += 1;
-
-                if (desc->lck_cnt > MAX_IRQ_CNT) {
-                        printk(KERN_ERR "IRQ LOCK: IRQ%d is locking the system, disabled\n", irq);
-                        return 1;
-                }
-        } else {
-                desc->lck_cnt = 0;
-                desc->lck_pc  = instruction_pointer(regs);
-                desc->lck_jif = jiffies;
-        }
-        return 0;
-}
-
-static void
-report_bad_irq(unsigned int irq, struct pt_regs *regs, struct irqdesc *desc, int ret)
-{
-        static int count = 100;
-        struct irqaction *action;
-
-        if (noirqdebug)
-                return;
-
-        if (ret != IRQ_HANDLED && ret != IRQ_NONE) {
-                if (!count)
-                        return;
-                count--;
-                printk("irq%u: bogus retval mask %x\n", irq, ret);
-        } else {
-                desc->irqs_unhandled++;
-                if (desc->irqs_unhandled <= 99900)
-                        return;
-                desc->irqs_unhandled = 0;
-                printk("irq%u: nobody cared\n", irq);
-        }
-        show_regs(regs);
-        dump_stack();
-        printk(KERN_ERR "handlers:");
-        action = desc->action;
-        do {
-                printk("\n" KERN_ERR "[<%p>]", action->handler);
-                print_symbol(" (%s)", (unsigned long)action->handler);
-                action = action->next;
-        } while (action);
-        printk("\n");
-}
-
-static int
-__do_irq(unsigned int irq, struct irqaction *action, struct pt_regs *regs)
-{
-        unsigned int status;
-        int ret, retval = 0;
-
-        spin_unlock(&irq_controller_lock);
-
-#ifdef CONFIG_NO_IDLE_HZ
-        if (!(action->flags & SA_TIMER) && system_timer->dyn_tick != NULL) {
-                spin_lock(&system_timer->dyn_tick->lock);
-                if (system_timer->dyn_tick->state & DYN_TICK_ENABLED)
-                        system_timer->dyn_tick->handler(irq, 0, regs);
-                spin_unlock(&system_timer->dyn_tick->lock);
-        }
-#endif
-
-        if (!(action->flags & SA_INTERRUPT))
-                local_irq_enable();
-
-        status = 0;
-        do {
-                ret = action->handler(irq, action->dev_id, regs);
-                if (ret == IRQ_HANDLED)
-                        status |= action->flags;
-                retval |= ret;
-                action = action->next;
-        } while (action);
-
-        if (status & SA_SAMPLE_RANDOM)
-                add_interrupt_randomness(irq);
-
-        spin_lock_irq(&irq_controller_lock);
-
-        return retval;
-}
-
-/*
- * This is for software-decoded IRQs.  The caller is expected to
- * handle the ack, clear, mask and unmask issues.
- */
-void
-do_simple_IRQ(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs)
-{
-        struct irqaction *action;
-        const unsigned int cpu = smp_processor_id();
-
-        desc->triggered = 1;
-
-        kstat_cpu(cpu).irqs[irq]++;
-
-        smp_set_running(desc);
-
-        action = desc->action;
-        if (action) {
-                int ret = __do_irq(irq, action, regs);
-                if (ret != IRQ_HANDLED)
-                        report_bad_irq(irq, regs, desc, ret);
-        }
-
-        smp_clear_running(desc);
-}
-
-/*
- * Most edge-triggered IRQ implementations seem to take a broken
- * approach to this.  Hence the complexity.
- */
-void
-do_edge_IRQ(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs)
-{
-        const unsigned int cpu = smp_processor_id();
-
-        desc->triggered = 1;
-
-        /*
-         * If we're currently running this IRQ, or its disabled,
-         * we shouldn't process the IRQ.  Instead, turn on the
-         * hardware masks.
-         */
-        if (unlikely(desc->running || desc->disable_depth))
-                goto running;
-
-        /*
-         * Acknowledge and clear the IRQ, but don't mask it.
-         */
-        desc->chip->ack(irq);
-
-        /*
-         * Mark the IRQ currently in progress.
-         */
-        desc->running = 1;
-
-        kstat_cpu(cpu).irqs[irq]++;
-
-        do {
-                struct irqaction *action;
-
-                action = desc->action;
-                if (!action)
-                        break;
-
-                if (desc->pending && !desc->disable_depth) {
-                        desc->pending = 0;
-                        desc->chip->unmask(irq);
-                }
-
-                __do_irq(irq, action, regs);
-        } while (desc->pending && !desc->disable_depth);
-
-        desc->running = 0;
-
-        /*
-         * If we were disabled or freed, shut down the handler.
-         */
-        if (likely(desc->action && !check_irq_lock(desc, irq, regs)))
-                return;
-
- running:
-        /*
-         * We got another IRQ while this one was masked or
-         * currently running.  Delay it.
-         */
-        desc->pending = 1;
-        desc->chip->mask(irq);
-        desc->chip->ack(irq);
-}
-
-/*
- * Level-based IRQ handler.  Nice and simple.
- */
-void
-do_level_IRQ(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs)
-{
-        struct irqaction *action;
-        const unsigned int cpu = smp_processor_id();
-
-        desc->triggered = 1;
-
-        /*
-         * Acknowledge, clear _AND_ disable the interrupt.
-         */
-        desc->chip->ack(irq);
-
-        if (likely(!desc->disable_depth)) {
-                kstat_cpu(cpu).irqs[irq]++;
-
-                smp_set_running(desc);
-
-                /*
-                 * Return with this interrupt masked if no action
-                 */
-                action = desc->action;
-                if (action) {
-                        int ret = __do_irq(irq, desc->action, regs);
-
-                        if (ret != IRQ_HANDLED)
-                                report_bad_irq(irq, regs, desc, ret);
-
-                        if (likely(!desc->disable_depth &&
-                                   !check_irq_lock(desc, irq, regs)))
-                                desc->chip->unmask(irq);
-                }
-
-                smp_clear_running(desc);
-        }
-}
-
-static void do_pending_irqs(struct pt_regs *regs)
-{
-        struct list_head head, *l, *n;
-
-        do {
-                struct irqdesc *desc;
-
-                /*
-                 * First, take the pending interrupts off the list.
-                 * The act of calling the handlers may add some IRQs
-                 * back onto the list.
-                 */
-                head = irq_pending;
-                INIT_LIST_HEAD(&irq_pending);
-                head.next->prev = &head;
-                head.prev->next = &head;
-
-                /*
-                 * Now run each entry.  We must delete it from our
-                 * list before calling the handler.
-                 */
-                list_for_each_safe(l, n, &head) {
-                        desc = list_entry(l, struct irqdesc, pend);
-                        list_del_init(&desc->pend);
-                        desc_handle_irq(desc - irq_desc, desc, regs);
-                }
-
-                /*
-                 * The list must be empty.
-                 */
-                BUG_ON(!list_empty(&head));
-        } while (!list_empty(&irq_pending));
-}
+/* Handle bad interrupts */
+static struct irq_desc bad_irq_desc = {
+        .handle_irq = handle_bad_irq,
+        .lock = SPIN_LOCK_UNLOCKED
+};
 
 /*
  * do_IRQ handles all hardware IRQ's.  Decoded IRQs should not
@@ -549,96 +120,15 @@ asmlinkage void asm_do_IRQ(unsigned int irq, struct pt_regs *regs)
                 desc = &bad_irq_desc;
 
         irq_enter();
-        spin_lock(&irq_controller_lock);
-        desc_handle_irq(irq, desc, regs);
 
-        /*
-         * Now re-run any pending interrupts.
-         */
-        if (!list_empty(&irq_pending))
-                do_pending_irqs(regs);
+        desc_handle_irq(irq, desc, regs);
 
+        /* AT91 specific workaround */
         irq_finish(irq);
 
-        spin_unlock(&irq_controller_lock);
         irq_exit();
 }
 
-void __set_irq_handler(unsigned int irq, irq_handler_t handle, int is_chained)
-{
-        struct irqdesc *desc;
-        unsigned long flags;
-
-        if (irq >= NR_IRQS) {
-                printk(KERN_ERR "Trying to install handler for IRQ%d\n", irq);
-                return;
-        }
-
-        if (handle == NULL)
-                handle = do_bad_IRQ;
-
-        desc = irq_desc + irq;
-
-        if (is_chained && desc->chip == &bad_chip)
-                printk(KERN_WARNING "Trying to install chained handler for IRQ%d\n", irq);
-
-        spin_lock_irqsave(&irq_controller_lock, flags);
-        if (handle == do_bad_IRQ) {
-                desc->chip->mask(irq);
-                desc->chip->ack(irq);
-                desc->disable_depth = 1;
-        }
-        desc->handle = handle;
-        if (handle != do_bad_IRQ && is_chained) {
-                desc->valid = 0;
-                desc->probe_ok = 0;
-                desc->disable_depth = 0;
-                desc->chip->unmask(irq);
-        }
-        spin_unlock_irqrestore(&irq_controller_lock, flags);
-}
-
-void set_irq_chip(unsigned int irq, struct irqchip *chip)
-{
-        struct irqdesc *desc;
-        unsigned long flags;
-
-        if (irq >= NR_IRQS) {
-                printk(KERN_ERR "Trying to install chip for IRQ%d\n", irq);
-                return;
-        }
-
-        if (chip == NULL)
-                chip = &bad_chip;
-
-        desc = irq_desc + irq;
-        spin_lock_irqsave(&irq_controller_lock, flags);
-        desc->chip = chip;
-        spin_unlock_irqrestore(&irq_controller_lock, flags);
-}
-
-int set_irq_type(unsigned int irq, unsigned int type)
-{
-        struct irqdesc *desc;
-        unsigned long flags;
-        int ret = -ENXIO;
-
-        if (irq >= NR_IRQS) {
-                printk(KERN_ERR "Trying to set irq type for IRQ%d\n", irq);
-                return -ENODEV;
-        }
-
-        desc = irq_desc + irq;
-        if (desc->chip->set_type) {
-                spin_lock_irqsave(&irq_controller_lock, flags);
-                ret = desc->chip->set_type(irq, type);
-                spin_unlock_irqrestore(&irq_controller_lock, flags);
-        }
-
-        return ret;
-}
-EXPORT_SYMBOL(set_irq_type);
-
 void set_irq_flags(unsigned int irq, unsigned int iflags)
 {
         struct irqdesc *desc;
@@ -650,421 +140,32 @@ void set_irq_flags(unsigned int irq, unsigned int iflags)
         }
 
         desc = irq_desc + irq;
-        spin_lock_irqsave(&irq_controller_lock, flags);
-        desc->valid = (iflags & IRQF_VALID) != 0;
-        desc->probe_ok = (iflags & IRQF_PROBE) != 0;
-        desc->noautoenable = (iflags & IRQF_NOAUTOEN) != 0;
-        spin_unlock_irqrestore(&irq_controller_lock, flags);
-}
-
-int setup_irq(unsigned int irq, struct irqaction *new)
-{
-        int shared = 0;
-        struct irqaction *old, **p;
-        unsigned long flags;
-        struct irqdesc *desc;
-
-        /*
-         * Some drivers like serial.c use request_irq() heavily,
-         * so we have to be careful not to interfere with a
-         * running system.
-         */
-        if (new->flags & SA_SAMPLE_RANDOM) {
-                /*
-                 * This function might sleep, we want to call it first,
-                 * outside of the atomic block.
-                 * Yes, this might clear the entropy pool if the wrong
-                 * driver is attempted to be loaded, without actually
-                 * installing a new handler, but is this really a problem,
-                 * only the sysadmin is able to do this.
-                 */
-                rand_initialize_irq(irq);
-        }
-
-        /*
-         * The following block of code has to be executed atomically
-         */
-        desc = irq_desc + irq;
-        spin_lock_irqsave(&irq_controller_lock, flags);
-        p = &desc->action;
-        if ((old = *p) != NULL) {
-                /*
-                 * Can't share interrupts unless both agree to and are
-                 * the same type.
-                 */
-                if (!(old->flags & new->flags & SA_SHIRQ) ||
-                    (~old->flags & new->flags) & SA_TRIGGER_MASK) {
-                        spin_unlock_irqrestore(&irq_controller_lock, flags);
-                        return -EBUSY;
-                }
-
-                /* add new interrupt at end of irq queue */
-                do {
-                        p = &old->next;
-                        old = *p;
-                } while (old);
-                shared = 1;
-        }
-
-        *p = new;
-
-        if (!shared) {
-                desc->probing = 0;
-                desc->running = 0;
-                desc->pending = 0;
-                desc->disable_depth = 1;
-
-                if (new->flags & SA_TRIGGER_MASK &&
-                    desc->chip->set_type) {
-                        unsigned int type = new->flags & SA_TRIGGER_MASK;
-                        desc->chip->set_type(irq, type);
-                }
-
-                if (!desc->noautoenable) {
-                        desc->disable_depth = 0;
-                        desc->chip->unmask(irq);
-                }
-        }
-
-        spin_unlock_irqrestore(&irq_controller_lock, flags);
-        return 0;
-}
-
-/**
- *      request_irq - allocate an interrupt line
- *      @irq: Interrupt line to allocate
- *      @handler: Function to be called when the IRQ occurs
- *      @irqflags: Interrupt type flags
- *      @devname: An ascii name for the claiming device
- *      @dev_id: A cookie passed back to the handler function
- *
- *      This call allocates interrupt resources and enables the
- *      interrupt line and IRQ handling. From the point this
- *      call is made your handler function may be invoked. Since
- *      your handler function must clear any interrupt the board
- *      raises, you must take care both to initialise your hardware
- *      and to set up the interrupt handler in the right order.
- *
- *      Dev_id must be globally unique. Normally the address of the
- *      device data structure is used as the cookie. Since the handler
- *      receives this value it makes sense to use it.
- *
- *      If your interrupt is shared you must pass a non NULL dev_id
- *      as this is required when freeing the interrupt.
- *
- *      Flags:
- *
- *      SA_SHIRQ                Interrupt is shared
- *
- *      SA_INTERRUPT            Disable local interrupts while processing
- *
- *      SA_SAMPLE_RANDOM        The interrupt can be used for entropy
- *
- */
-int request_irq(unsigned int irq, irqreturn_t (*handler)(int, void *, struct pt_regs *),
-                 unsigned long irq_flags, const char * devname, void *dev_id)
-{
-        unsigned long retval;
-        struct irqaction *action;
-
-        if (irq >= NR_IRQS || !irq_desc[irq].valid || !handler ||
-            (irq_flags & SA_SHIRQ && !dev_id))
-                return -EINVAL;
-
-        action = (struct irqaction *)kmalloc(sizeof(struct irqaction), GFP_KERNEL);
-        if (!action)
-                return -ENOMEM;
-
-        action->handler = handler;
-        action->flags = irq_flags;
-        cpus_clear(action->mask);
-        action->name = devname;
-        action->next = NULL;
-        action->dev_id = dev_id;
-
-        retval = setup_irq(irq, action);
-
-        if (retval)
-                kfree(action);
-        return retval;
-}
-
-EXPORT_SYMBOL(request_irq);
-
-/**
- *      free_irq - free an interrupt
- *      @irq: Interrupt line to free
- *      @dev_id: Device identity to free
- *
- *      Remove an interrupt handler. The handler is removed and if the
- *      interrupt line is no longer in use by any driver it is disabled.
- *      On a shared IRQ the caller must ensure the interrupt is disabled
- *      on the card it drives before calling this function.
- *
- *      This function must not be called from interrupt context.
- */
-void free_irq(unsigned int irq, void *dev_id)
-{
-        struct irqaction * action, **p;
-        unsigned long flags;
-
-        if (irq >= NR_IRQS || !irq_desc[irq].valid) {
-                printk(KERN_ERR "Trying to free IRQ%d\n",irq);
-                dump_stack();
-                return;
-        }
-
-        spin_lock_irqsave(&irq_controller_lock, flags);
-        for (p = &irq_desc[irq].action; (action = *p) != NULL; p = &action->next) {
-                if (action->dev_id != dev_id)
-                        continue;
-
-                /* Found it - now free it */
-                *p = action->next;
-                break;
-        }
-        spin_unlock_irqrestore(&irq_controller_lock, flags);
-
-        if (!action) {
-                printk(KERN_ERR "Trying to free free IRQ%d\n",irq);
-                dump_stack();
-        } else {
-                synchronize_irq(irq);
-                kfree(action);
-        }
-}
-
-EXPORT_SYMBOL(free_irq);
-
-static DECLARE_MUTEX(probe_sem);
-
-/* Start the interrupt probing.  Unlike other architectures,
- * we don't return a mask of interrupts from probe_irq_on,
- * but return the number of interrupts enabled for the probe.
- * The interrupts which have been enabled for probing is
- * instead recorded in the irq_desc structure.
- */
-unsigned long probe_irq_on(void)
-{
-        unsigned int i, irqs = 0;
-        unsigned long delay;
-
-        down(&probe_sem);
-
-        /*
-         * first snaffle up any unassigned but
-         * probe-able interrupts
-         */
-        spin_lock_irq(&irq_controller_lock);
-        for (i = 0; i < NR_IRQS; i++) {
-                if (!irq_desc[i].probe_ok || irq_desc[i].action)
-                        continue;
-
-                irq_desc[i].probing = 1;
-                irq_desc[i].triggered = 0;
-                if (irq_desc[i].chip->set_type)
-                        irq_desc[i].chip->set_type(i, IRQT_PROBE);
-                irq_desc[i].chip->unmask(i);
-                irqs += 1;
-        }
-        spin_unlock_irq(&irq_controller_lock);
-
-        /*
-         * wait for spurious interrupts to mask themselves out again
-         */
-        for (delay = jiffies + HZ/10; time_before(jiffies, delay); )
-                /* min 100ms delay */;
-
-        /*
-         * now filter out any obviously spurious interrupts
-         */
-        spin_lock_irq(&irq_controller_lock);
-        for (i = 0; i < NR_IRQS; i++) {
-                if (irq_desc[i].probing && irq_desc[i].triggered) {
-                        irq_desc[i].probing = 0;
-                        irqs -= 1;
-                }
-        }
-        spin_unlock_irq(&irq_controller_lock);
-
-        return irqs;
-}
-
-EXPORT_SYMBOL(probe_irq_on);
-
-unsigned int probe_irq_mask(unsigned long irqs)
-{
-        unsigned int mask = 0, i;
-
-        spin_lock_irq(&irq_controller_lock);
-        for (i = 0; i < 16 && i < NR_IRQS; i++)
-                if (irq_desc[i].probing && irq_desc[i].triggered)
-                        mask |= 1 << i;
-        spin_unlock_irq(&irq_controller_lock);
-
-        up(&probe_sem);
-
-        return mask;
-}
-EXPORT_SYMBOL(probe_irq_mask);
-
-/*
- * Possible return values:
- *  >= 0 - interrupt number
- *    -1 - no interrupt/many interrupts
- */
-int probe_irq_off(unsigned long irqs)
-{
-        unsigned int i;
-        int irq_found = NO_IRQ;
-
-        /*
-         * look at the interrupts, and find exactly one
-         * that we were probing has been triggered
-         */
-        spin_lock_irq(&irq_controller_lock);
-        for (i = 0; i < NR_IRQS; i++) {
-                if (irq_desc[i].probing &&
-                    irq_desc[i].triggered) {
-                        if (irq_found != NO_IRQ) {
-                                irq_found = NO_IRQ;
-                                goto out;
-                        }
-                        irq_found = i;
-                }
-        }
-
-        if (irq_found == -1)
-                irq_found = NO_IRQ;
-out:
-        spin_unlock_irq(&irq_controller_lock);
-
-        up(&probe_sem);
-
-        return irq_found;
-}
-
-EXPORT_SYMBOL(probe_irq_off);
-
-#ifdef CONFIG_SMP
-static void route_irq(struct irqdesc *desc, unsigned int irq, unsigned int cpu)
-{
-        pr_debug("IRQ%u: moving from cpu%u to cpu%u\n", irq, desc->cpu, cpu);
-
-        spin_lock_irq(&irq_controller_lock);
-        desc->cpu = cpu;
-        desc->chip->set_cpu(desc, irq, cpu);
-        spin_unlock_irq(&irq_controller_lock);
-}
-
-#ifdef CONFIG_PROC_FS
-static int
-irq_affinity_read_proc(char *page, char **start, off_t off, int count,
-                       int *eof, void *data)
-{
-        struct irqdesc *desc = irq_desc + ((int)data);
-        int len = cpumask_scnprintf(page, count, desc->affinity);
-
-        if (count - len < 2)
-                return -EINVAL;
-        page[len++] = '\n';
-        page[len] = '\0';
-
-        return len;
-}
-
-static int
-irq_affinity_write_proc(struct file *file, const char __user *buffer,
-                        unsigned long count, void *data)
-{
-        unsigned int irq = (unsigned int)data;
-        struct irqdesc *desc = irq_desc + irq;
-        cpumask_t affinity, tmp;
-        int ret = -EIO;
-
-        if (!desc->chip->set_cpu)
-                goto out;
-
-        ret = cpumask_parse(buffer, count, affinity);
-        if (ret)
-                goto out;
-
-        cpus_and(tmp, affinity, cpu_online_map);
-        if (cpus_empty(tmp)) {
-                ret = -EINVAL;
-                goto out;
-        }
-
-        desc->affinity = affinity;
-        route_irq(desc, irq, first_cpu(tmp));
-        ret = count;
-
- out:
-        return ret;
-}
-#endif
-#endif
-
-void __init init_irq_proc(void)
-{
-#if defined(CONFIG_SMP) && defined(CONFIG_PROC_FS)
-        struct proc_dir_entry *dir;
-        int irq;
-
-        dir = proc_mkdir("irq", NULL);
-        if (!dir)
-                return;
-
-        for (irq = 0; irq < NR_IRQS; irq++) {
-                struct proc_dir_entry *entry;
-                struct irqdesc *desc;
-                char name[16];
-
-                desc = irq_desc + irq;
-                memset(name, 0, sizeof(name));
-                snprintf(name, sizeof(name) - 1, "%u", irq);
-
-                desc->procdir = proc_mkdir(name, dir);
-                if (!desc->procdir)
-                        continue;
-
-                entry = create_proc_entry("smp_affinity", 0600, desc->procdir);
-                if (entry) {
-                        entry->nlink = 1;
-                        entry->data = (void *)irq;
-                        entry->read_proc = irq_affinity_read_proc;
-                        entry->write_proc = irq_affinity_write_proc;
-                }
-        }
-#endif
+        spin_lock_irqsave(&desc->lock, flags);
+        desc->status |= IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN;
+        if (iflags & IRQF_VALID)
+                desc->status &= ~IRQ_NOREQUEST;
+        if (iflags & IRQF_PROBE)
+                desc->status &= ~IRQ_NOPROBE;
+        if (!(iflags & IRQF_NOAUTOEN))
+                desc->status &= ~IRQ_NOAUTOEN;
+        spin_unlock_irqrestore(&desc->lock, flags);
 }
 
 void __init init_IRQ(void)
 {
-        struct irqdesc *desc;
         int irq;
 
+        for (irq = 0; irq < NR_IRQS; irq++)
+                irq_desc[irq].status |= IRQ_NOREQUEST | IRQ_DELAYED_DISABLE |
+                        IRQ_NOPROBE;
+
 #ifdef CONFIG_SMP
         bad_irq_desc.affinity = CPU_MASK_ALL;
         bad_irq_desc.cpu = smp_processor_id();
 #endif
-
-        for (irq = 0, desc = irq_desc; irq < NR_IRQS; irq++, desc++) {
-                *desc = bad_irq_desc;
-                INIT_LIST_HEAD(&desc->pend);
-        }
-
         init_arch_irq();
 }
 
-static int __init noirqdebug_setup(char *str)
-{
-        noirqdebug = 1;
-        return 1;
-}
-
-__setup("noirqdebug", noirqdebug_setup);
-
 #ifdef CONFIG_HOTPLUG_CPU
 /*
  * The CPU has been marked offline.  Migrate IRQs off this CPU.  If
diff --git a/arch/arm/mach-at91rm9200/at91rm9200_time.c b/arch/arm/mach-at91rm9200/at91rm9200_time.c
index dc38e06ada63..0aa22650a00f 100644
--- a/arch/arm/mach-at91rm9200/at91rm9200_time.c
+++ b/arch/arm/mach-at91rm9200/at91rm9200_time.c
@@ -21,13 +21,13 @@
 
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/time.h>
 
 #include <asm/hardware.h>
 #include <asm/io.h>
-#include <asm/irq.h>
 #include <asm/mach/time.h>
 
 static unsigned long last_crtr;
diff --git a/arch/arm/mach-at91rm9200/gpio.c b/arch/arm/mach-at91rm9200/gpio.c
index 83c34747087b..5783c282ae7b 100644
--- a/arch/arm/mach-at91rm9200/gpio.c
+++ b/arch/arm/mach-at91rm9200/gpio.c
@@ -10,12 +10,13 @@
  */
 
 #include <linux/errno.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/module.h>
 
 #include <asm/io.h>
-#include <asm/mach/irq.h>
 #include <asm/hardware.h>
 #include <asm/arch/gpio.h>
 
@@ -340,7 +341,7 @@ static void gpio_irq_handler(unsigned irq, struct irqdesc *desc, struct pt_regs
         void __iomem    *pio;
         u32             isr;
 
-        pio = desc->base;
+        pio = get_irq_chip_data(irq);
 
         /* temporarily mask (level sensitive) parent IRQ */
         desc->chip->ack(irq);
@@ -350,12 +351,12 @@ static void gpio_irq_handler(unsigned irq, struct irqdesc *desc, struct pt_regs
                 if (!isr)
                         break;
 
-                pin = (unsigned) desc->data;
+                pin = (unsigned) get_irq_data(irq);
                 gpio = &irq_desc[pin];
 
                 while (isr) {
                         if (isr & 1) {
-                                if (unlikely(gpio->disable_depth)) {
+                                if (unlikely(gpio->depth)) {
                                         /*
                                          * The core ARM interrupt handler lazily disables IRQs so
                                          * another IRQ must be generated before it actually gets
@@ -364,7 +365,7 @@ static void gpio_irq_handler(unsigned irq, struct irqdesc *desc, struct pt_regs
                                         gpio_irq_mask(pin);
                                 }
                                 else
-                                        gpio->handle(pin, gpio, regs);
+                                        desc_handle_irq(pin, gpio, regs);
                         }
                         pin++;
                         gpio++;
diff --git a/arch/arm/mach-clps711x/time.c b/arch/arm/mach-clps711x/time.c
index 1a23f0dcd4b8..b0f1db258e80 100644
--- a/arch/arm/mach-clps711x/time.c
+++ b/arch/arm/mach-clps711x/time.c
@@ -19,6 +19,7 @@
 #include <linux/timex.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/sched.h>
 
 #include <asm/hardware.h>
diff --git a/arch/arm/mach-clps7500/core.c b/arch/arm/mach-clps7500/core.c
index 5b12cab0e691..cd66df896364 100644
--- a/arch/arm/mach-clps7500/core.c
+++ b/arch/arm/mach-clps7500/core.c
@@ -9,6 +9,7 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/list.h>
 #include <linux/sched.h>
 #include <linux/init.h>
diff --git a/arch/arm/mach-footbridge/dc21285-timer.c b/arch/arm/mach-footbridge/dc21285-timer.c
index 14a62d6008fe..e668d4acd808 100644
--- a/arch/arm/mach-footbridge/dc21285-timer.c
+++ b/arch/arm/mach-footbridge/dc21285-timer.c
@@ -6,6 +6,7 @@
  */
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 
 #include <asm/irq.h>
 
diff --git a/arch/arm/mach-footbridge/isa-timer.c b/arch/arm/mach-footbridge/isa-timer.c
index c1d74f7ab669..282b473c21f2 100644
--- a/arch/arm/mach-footbridge/isa-timer.c
+++ b/arch/arm/mach-footbridge/isa-timer.c
@@ -6,6 +6,7 @@
  */
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
diff --git a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c
index 294b1c450f21..5f9a04775a47 100644
--- a/arch/arm/mach-imx/time.c
+++ b/arch/arm/mach-imx/time.c
@@ -12,6 +12,7 @@
 #include <linux/sched.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/time.h>
 
 #include <asm/hardware.h>
diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c
index 576a5e979c00..2d7e505e748f 100644
--- a/arch/arm/mach-integrator/core.c
+++ b/arch/arm/mach-integrator/core.c
@@ -13,6 +13,7 @@
 #include <linux/device.h>
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/sched.h>
 #include <linux/smp.h>
 #include <linux/termios.h>
diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c
index 3cfc5aab8259..b31f31ac937b 100644
--- a/arch/arm/mach-ixp2000/core.c
+++ b/arch/arm/mach-ixp2000/core.c
@@ -19,6 +19,7 @@
 #include <linux/spinlock.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/serial.h>
 #include <linux/tty.h>
 #include <linux/bitops.h>
@@ -408,7 +409,7 @@ static void ixp2000_err_irq_handler(unsigned int irq, struct irqdesc *desc,  str
         for(i = 31; i >= 0; i--) {
                 if(status & (1 << i)) {
                         desc = irq_desc + IRQ_IXP2000_DRAM0_MIN_ERR + i;
-                        desc->handle(IRQ_IXP2000_DRAM0_MIN_ERR + i, desc, regs);
+                        desc_handle_irq(IRQ_IXP2000_DRAM0_MIN_ERR + i, desc, regs);
                 }
         }
 }
diff --git a/arch/arm/mach-ixp2000/ixdp2x00.c b/arch/arm/mach-ixp2000/ixdp2x00.c
index 9b8ded259807..40eef8b36740 100644
--- a/arch/arm/mach-ixp2000/ixdp2x00.c
+++ b/arch/arm/mach-ixp2000/ixdp2x00.c
@@ -167,7 +167,7 @@ void ixdp2x00_init_irq(volatile unsigned long *stat_reg, volatile unsigned long
         }
 
         /* Hook into PCI interrupt */
-        set_irq_chained_handler(IRQ_IXP2000_PCIB, &ixdp2x00_irq_handler);
+        set_irq_chained_handler(IRQ_IXP2000_PCIB, ixdp2x00_irq_handler);
 }
 
 /*************************************************************************
diff --git a/arch/arm/mach-ixp2000/ixdp2x01.c b/arch/arm/mach-ixp2000/ixdp2x01.c
index 8477ae1d8f72..7f42366f60d1 100644
--- a/arch/arm/mach-ixp2000/ixdp2x01.c
+++ b/arch/arm/mach-ixp2000/ixdp2x01.c
@@ -127,7 +127,7 @@ void __init ixdp2x01_init_irq(void)
         }
 
         /* Hook into PCI interrupts */
-        set_irq_chained_handler(IRQ_IXP2000_PCIB, &ixdp2x01_irq_handler);
+        set_irq_chained_handler(IRQ_IXP2000_PCIB, ixdp2x01_irq_handler);
 }
 
 
diff --git a/arch/arm/mach-ixp23xx/core.c b/arch/arm/mach-ixp23xx/core.c
index 82ad6ef90a38..7c218aecf443 100644
--- a/arch/arm/mach-ixp23xx/core.c
+++ b/arch/arm/mach-ixp23xx/core.c
@@ -271,7 +271,7 @@ static void pci_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *
         }
 
         int_desc = irq_desc + irqno;
-        int_desc->handle(irqno, int_desc, regs);
+        desc_handle_irq(irqno, int_desc, regs);
 
         desc->chip->unmask(irq);
 }
diff --git a/arch/arm/mach-ixp23xx/ixdp2351.c b/arch/arm/mach-ixp23xx/ixdp2351.c
index bba9d9f08691..37a32e6bcca2 100644
--- a/arch/arm/mach-ixp23xx/ixdp2351.c
+++ b/arch/arm/mach-ixp23xx/ixdp2351.c
@@ -19,6 +19,7 @@
 #include <linux/spinlock.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/serial.h>
 #include <linux/tty.h>
 #include <linux/bitops.h>
@@ -36,7 +37,6 @@
 #include <asm/memory.h>
 #include <asm/hardware.h>
 #include <asm/mach-types.h>
-#include <asm/irq.h>
 #include <asm/system.h>
 #include <asm/tlbflush.h>
 #include <asm/pgtable.h>
@@ -74,7 +74,7 @@ static void ixdp2351_inta_handler(unsigned int irq, struct irqdesc *desc, struct
                         int cpld_irq =
                                 IXP23XX_MACH_IRQ(IXDP2351_INTA_IRQ_BASE + i);
                         cpld_desc = irq_desc + cpld_irq;
-                        cpld_desc->handle(cpld_irq, cpld_desc, regs);
+                        desc_handle_irq(cpld_irq, cpld_desc, regs);
                 }
         }
 
@@ -111,7 +111,7 @@ static void ixdp2351_intb_handler(unsigned int irq, struct irqdesc *desc, struct
                         int cpld_irq =
                                 IXP23XX_MACH_IRQ(IXDP2351_INTB_IRQ_BASE + i);
                         cpld_desc = irq_desc + cpld_irq;
-                        cpld_desc->handle(cpld_irq, cpld_desc, regs);
+                        desc_handle_irq(cpld_irq, cpld_desc, regs);
                 }
         }
 
@@ -158,8 +158,8 @@ void ixdp2351_init_irq(void)
                 }
         }
 
-        set_irq_chained_handler(IRQ_IXP23XX_INTA, &ixdp2351_inta_handler);
-        set_irq_chained_handler(IRQ_IXP23XX_INTB, &ixdp2351_intb_handler);
+        set_irq_chained_handler(IRQ_IXP23XX_INTA, ixdp2351_inta_handler);
+        set_irq_chained_handler(IRQ_IXP23XX_INTB, ixdp2351_intb_handler);
 }
 
 /*
diff --git a/arch/arm/mach-ixp4xx/coyote-pci.c b/arch/arm/mach-ixp4xx/coyote-pci.c
index e6b7fcd923fa..2cebb2878895 100644
--- a/arch/arm/mach-ixp4xx/coyote-pci.c
+++ b/arch/arm/mach-ixp4xx/coyote-pci.c
@@ -17,6 +17,7 @@
 #include <linux/kernel.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/irq.h>
 
 #include <asm/mach-types.h>
 #include <asm/hardware.h>
diff --git a/arch/arm/mach-ixp4xx/ixdp425-pci.c b/arch/arm/mach-ixp4xx/ixdp425-pci.c
index 8b8ca80c9449..d5156c043f0b 100644
--- a/arch/arm/mach-ixp4xx/ixdp425-pci.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c
@@ -17,6 +17,7 @@
 #include <linux/kernel.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/irq.h>
 #include <linux/delay.h>
 
 #include <asm/mach/pci.h>
diff --git a/arch/arm/mach-ixp4xx/ixdpg425-pci.c b/arch/arm/mach-ixp4xx/ixdpg425-pci.c
index 526fb6175bc3..ed5270800217 100644
--- a/arch/arm/mach-ixp4xx/ixdpg425-pci.c
+++ b/arch/arm/mach-ixp4xx/ixdpg425-pci.c
@@ -16,10 +16,10 @@
 #include <linux/kernel.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/irq.h>
 
 #include <asm/mach-types.h>
 #include <asm/hardware.h>
-#include <asm/irq.h>
 
 #include <asm/mach/pci.h>
 
diff --git a/arch/arm/mach-ixp4xx/nas100d-pci.c b/arch/arm/mach-ixp4xx/nas100d-pci.c
index 2d3b770d9e82..b8ebaf4a9c8e 100644
--- a/arch/arm/mach-ixp4xx/nas100d-pci.c
+++ b/arch/arm/mach-ixp4xx/nas100d-pci.c
@@ -17,6 +17,7 @@
 
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/irq.h>
 
 #include <asm/mach/pci.h>
 #include <asm/mach-types.h>
diff --git a/arch/arm/mach-ixp4xx/nas100d-power.c b/arch/arm/mach-ixp4xx/nas100d-power.c
index a3745ed37f9f..f58a1d05a02e 100644
--- a/arch/arm/mach-ixp4xx/nas100d-power.c
+++ b/arch/arm/mach-ixp4xx/nas100d-power.c
@@ -17,9 +17,9 @@
  *
  */
 
-#include <linux/module.h>
-#include <linux/reboot.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/module.h>
 #include <linux/reboot.h>
 
 #include <asm/mach-types.h>
diff --git a/arch/arm/mach-l7200/core.c b/arch/arm/mach-l7200/core.c
index ac626436e96f..b7af5640ea7b 100644
--- a/arch/arm/mach-l7200/core.c
+++ b/arch/arm/mach-l7200/core.c
@@ -7,6 +7,7 @@
  */
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/irq.h>
 #include <linux/device.h>
 
 #include <asm/types.h>
diff --git a/arch/arm/mach-lh7a40x/arch-lpd7a40x.c b/arch/arm/mach-lh7a40x/arch-lpd7a40x.c
index c0e6854289f1..35c3606a2079 100644
--- a/arch/arm/mach-lh7a40x/arch-lpd7a40x.c
+++ b/arch/arm/mach-lh7a40x/arch-lpd7a40x.c
@@ -12,6 +12,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 
 #include <asm/hardware.h>
 #include <asm/setup.h>
diff --git a/arch/arm/mach-lh7a40x/time.c b/arch/arm/mach-lh7a40x/time.c
index 1919835d9610..4d26c9f62c71 100644
--- a/arch/arm/mach-lh7a40x/time.c
+++ b/arch/arm/mach-lh7a40x/time.c
@@ -11,6 +11,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/time.h>
 
 #include <asm/hardware.h>
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index e0711d23a6b0..91933301bb73 100644
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -29,7 +29,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <linux/interrupt.h>
+#include <linux/irq.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c
index 56319742aa1b..5615fb8a3d5b 100644
--- a/arch/arm/mach-omap1/serial.c
+++ b/arch/arm/mach-omap1/serial.c
@@ -11,6 +11,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/irq.h>
 #include <linux/delay.h>
 #include <linux/serial.h>
 #include <linux/tty.h>
diff --git a/arch/arm/mach-pxa/idp.c b/arch/arm/mach-pxa/idp.c
index 347b9dea24c6..6914d22bc20f 100644
--- a/arch/arm/mach-pxa/idp.c
+++ b/arch/arm/mach-pxa/idp.c
@@ -18,6 +18,7 @@
 
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/platform_device.h>
 #include <linux/fb.h>
 
diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
index 0f1648780c41..1e5e6ca693ee 100644
--- a/arch/arm/mach-pxa/sharpsl_pm.c
+++ b/arch/arm/mach-pxa/sharpsl_pm.c
@@ -18,11 +18,11 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/platform_device.h>
 
 #include <asm/hardware.h>
 #include <asm/mach-types.h>
-#include <asm/irq.h>
 #include <asm/apm.h>
 #include <asm/arch/pm.h>
 #include <asm/arch/pxa-regs.h>
diff --git a/arch/arm/mach-s3c2410/bast-irq.c b/arch/arm/mach-s3c2410/bast-irq.c
index fbbeb0553006..def4441d2442 100644
--- a/arch/arm/mach-s3c2410/bast-irq.c
+++ b/arch/arm/mach-s3c2410/bast-irq.c
@@ -136,8 +136,8 @@ bast_irq_pc104_demux(unsigned int irq,
                 for (i = 0; stat != 0; i++, stat >>= 1) {
                         if (stat & 1) {
                                 irqno = bast_pc104_irqs[i];
-
-                                desc_handle_irq(irqno, irq_desc + irqno, regs);
+                                desc = irq_desc + irqno;
+                                desc_handle_irq(irqno, desc, regs);
                         }
                 }
         }
@@ -156,7 +156,7 @@ static __init int bast_irq_init(void)
 
                 set_irq_chained_handler(IRQ_ISA, bast_irq_pc104_demux);
 
-                /* reigster our IRQs */
+                /* register our IRQs */
 
                 for (i = 0; i < 4; i++) {
                         unsigned int irqno = bast_pc104_irqs[i];
diff --git a/arch/arm/mach-s3c2410/time.c b/arch/arm/mach-s3c2410/time.c
index 47387c5b9723..c153c49c75dc 100644
--- a/arch/arm/mach-s3c2410/time.c
+++ b/arch/arm/mach-s3c2410/time.c
@@ -22,6 +22,7 @@
 #include <linux/sched.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/err.h>
 #include <linux/clk.h>
 
diff --git a/arch/arm/mach-sa1100/cerf.c b/arch/arm/mach-sa1100/cerf.c
index e0f6d57b5065..31afe50d7cd5 100644
--- a/arch/arm/mach-sa1100/cerf.c
+++ b/arch/arm/mach-sa1100/cerf.c
@@ -14,6 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/tty.h>
 #include <linux/platform_device.h>
+#include <linux/irq.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c
index e727ba87b9f2..e10d661c015f 100644
--- a/arch/arm/mach-sa1100/h3600.c
+++ b/arch/arm/mach-sa1100/h3600.c
@@ -835,7 +835,7 @@ static void __init h3800_init_irq(void)
         }
 #endif
         set_irq_type(IRQ_GPIO_H3800_ASIC, IRQT_RISING);
-        set_irq_chained_handler(IRQ_GPIO_H3800_ASIC, &h3800_IRQ_demux);
+        set_irq_chained_handler(IRQ_GPIO_H3800_ASIC, h3800_IRQ_demux);
 }
 
 
diff --git a/arch/arm/mach-sa1100/irq.c b/arch/arm/mach-sa1100/irq.c
index b3a56024182e..2891b8ca86dd 100644
--- a/arch/arm/mach-sa1100/irq.c
+++ b/arch/arm/mach-sa1100/irq.c
@@ -11,12 +11,13 @@
  */
 #include <linux/init.h>
 #include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/ioport.h>
 #include <linux/ptrace.h>
 #include <linux/sysdev.h>
 
 #include <asm/hardware.h>
-#include <asm/irq.h>
 #include <asm/mach/irq.h>
 
 #include "generic.h"
diff --git a/arch/arm/mach-sa1100/pleb.c b/arch/arm/mach-sa1100/pleb.c
index 0709ebab531c..c7bf7e0038f0 100644
--- a/arch/arm/mach-sa1100/pleb.c
+++ b/arch/arm/mach-sa1100/pleb.c
@@ -7,6 +7,7 @@
 #include <linux/tty.h>
 #include <linux/ioport.h>
 #include <linux/platform_device.h>
+#include <linux/irq.h>
 
 #include <linux/mtd/partitions.h>
 
diff --git a/arch/arm/mach-sa1100/time.c b/arch/arm/mach-sa1100/time.c
index e4b435e634e4..688b1e109a40 100644
--- a/arch/arm/mach-sa1100/time.c
+++ b/arch/arm/mach-sa1100/time.c
@@ -11,6 +11,7 @@
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/timex.h>
 #include <linux/signal.h>
 
diff --git a/arch/arm/mach-shark/core.c b/arch/arm/mach-shark/core.c
index 877600e212dd..2f2c6e97b7a3 100644
--- a/arch/arm/mach-shark/core.c
+++ b/arch/arm/mach-shark/core.c
@@ -6,6 +6,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/sched.h>
 #include <linux/serial_8250.h>
 
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index c5d0214ef191..c2c05ef86348 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -24,9 +24,9 @@
 #include <linux/spinlock.h>
 #include <linux/errno.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 
 #include <asm/system.h>
-#include <asm/irq.h>
 #include <asm/hardware.h>
 #include <asm/dma.h>
 #include <asm/io.h>
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index ae08eeec7aad..cb0c21d384c0 100644
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -783,7 +783,7 @@ static void gpio_irq_handler(unsigned int irq, struct irqdesc *desc,
 
         desc->chip->ack(irq);
 
-        bank = (struct gpio_bank *) desc->data;
+        bank = get_irq_data(irq);
         if (bank->method == METHOD_MPUIO)
                 isr_reg = bank->base + OMAP_MPUIO_GPIO_INT;
 #ifdef CONFIG_ARCH_OMAP15XX