Merge branch 'pxa-all' into devel

Conflicts:

	arch/arm/mach-pxa/Kconfig
	arch/arm/mach-pxa/corgi.c
	arch/arm/mach-pxa/include/mach/hardware.h
	arch/arm/mach-pxa/spitz.c

2 files changed, 7 insertions, 10 deletions

diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c
index 7a50575a8d4..60c079d8535 100644
--- a/arch/arm/kernel/ecard.c
+++ b/arch/arm/kernel/ecard.c
@@ -587,8 +587,7 @@ ecard_irq_handler(unsigned int irq, struct irq_desc *desc)
                         pending = ecard_default_ops.irqpending(ec);
 
                 if (pending) {
-                        struct irq_desc *d = irq_desc + ec->irq;
-                        desc_handle_irq(ec->irq, d);
+                        generic_handle_irq(ec->irq);
                         called ++;
                 }
         }
@@ -622,7 +621,6 @@ ecard_irqexp_handler(unsigned int irq, struct irq_desc *desc)
                 ecard_t *ec = slot_to_ecard(slot);
 
                 if (ec->claimed) {
-                        struct irq_desc *d = irq_desc + ec->irq;
                         /*
                          * this ugly code is so that we can operate a
                          * prioritorising system:
@@ -635,7 +633,7 @@ ecard_irqexp_handler(unsigned int irq, struct irq_desc *desc)
                          * Serial cards should go in 0/1, ethernet/scsi in 2/3
                          * otherwise you will lose serial data at high speeds!
                          */
-                        desc_handle_irq(ec->irq, d);
+                        generic_handle_irq(ec->irq);
                 } else {
                         printk(KERN_WARNING "card%d: interrupt from unclaimed "
                                "card???\n", slot);
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c
index f88efb135b7..2f3eb795fa6 100644
--- a/arch/arm/kernel/irq.c
+++ b/arch/arm/kernel/irq.c
@@ -112,18 +112,17 @@ static struct irq_desc bad_irq_desc = {
 asmlinkage void __exception asm_do_IRQ(unsigned int irq, struct pt_regs *regs)
 {
         struct pt_regs *old_regs = set_irq_regs(regs);
-        struct irq_desc *desc = irq_desc + irq;
+
+        irq_enter();
 
         /*
          * Some hardware gives randomly wrong interrupts.  Rather
          * than crashing, do something sensible.
          */
         if (irq >= NR_IRQS)
-                desc = &bad_irq_desc;
-
-        irq_enter();
-
-        desc_handle_irq(irq, desc);
+                handle_bad_irq(irq, &bad_irq_desc);
+        else
+                generic_handle_irq(irq);
 
         /* AT91 specific workaround */
         irq_finish(irq);