linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / kernel / irq / spurious.c

diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
index 417e980..7df9abd 100644 (file)
--- a/kernel/irq/spurious.c
+++ b/kernel/irq/spurious.c
@@ -11,44 +11,44 @@
 #include <linux/kallsyms.h>
 #include <linux/interrupt.h>
 
-static int irqfixup __read_mostly;
+static int irqfixup;
 
 /*
  * Recovery handler for misrouted interrupts.
  */
+
 static int misrouted_irq(int irq, struct pt_regs *regs)
 {
        int i;
+       irq_desc_t *desc;
        int ok = 0;
        int work = 0;   /* Did we do work for a real IRQ */
 
-       for (i = 1; i < NR_IRQS; i++) {
-               struct irq_desc *desc = irq_desc + i;
+       for(i = 1; i < NR_IRQS; i++) {
                struct irqaction *action;
 
                if (i == irq)   /* Already tried */
                        continue;
-
+               desc = &irq_desc[i];
                spin_lock(&desc->lock);
+               action = desc->action;
                /* Already running on another processor */
                if (desc->status & IRQ_INPROGRESS) {
                        /*
                         * Already running: If it is shared get the other
                         * CPU to go looking for our mystery interrupt too
                         */
-                       if (desc->action && (desc->action->flags & IRQF_SHARED))
+                       if (desc->action && (desc->action->flags & SA_SHIRQ))
                                desc->status |= IRQ_PENDING;
                        spin_unlock(&desc->lock);
                        continue;
                }
                /* Honour the normal IRQ locking */
                desc->status |= IRQ_INPROGRESS;
-               action = desc->action;
                spin_unlock(&desc->lock);
-
                while (action) {
                        /* Only shared IRQ handlers are safe to call */
-                       if (action->flags & IRQF_SHARED) {
+                       if (action->flags & SA_SHIRQ) {
                                if (action->handler(i, action->dev_id, regs) ==
                                                IRQ_HANDLED)
                                        ok = 1;
@@ -62,8 +62,9 @@ static int misrouted_irq(int irq, struct pt_regs *regs)
 
                /*
                 * While we were looking for a fixup someone queued a real
-                * IRQ clashing with our walk:
+                * IRQ clashing with our walk
                 */
+
                while ((desc->status & IRQ_PENDING) && action) {
                        /*
                         * Perform real IRQ processing for the IRQ we deferred
@@ -79,8 +80,8 @@ static int misrouted_irq(int irq, struct pt_regs *regs)
                 * If we did actual work for the real IRQ line we must let the
                 * IRQ controller clean up too
                 */
-               if (work && desc->chip && desc->chip->end)
-                       desc->chip->end(i);
+               if(work)
+                       desc->handler->end(i);
                spin_unlock(&desc->lock);
        }
        /* So the caller can adjust the irq error counts */
@@ -99,8 +100,7 @@ static int misrouted_irq(int irq, struct pt_regs *regs)
  */
 
 static void
-__report_bad_irq(unsigned int irq, struct irq_desc *desc,
-                irqreturn_t action_ret)
+__report_bad_irq(unsigned int irq, irq_desc_t *desc, irqreturn_t action_ret)
 {
        struct irqaction *action;
 
@@ -113,7 +113,6 @@ __report_bad_irq(unsigned int irq, struct irq_desc *desc,
        }
        dump_stack();
        printk(KERN_ERR "handlers:\n");
-
        action = desc->action;
        while (action) {
                printk(KERN_ERR "[<%p>]", action->handler);
@@ -124,8 +123,7 @@ __report_bad_irq(unsigned int irq, struct irq_desc *desc,
        }
 }
 
-static void
-report_bad_irq(unsigned int irq, struct irq_desc *desc, irqreturn_t action_ret)
+static void report_bad_irq(unsigned int irq, irq_desc_t *desc, irqreturn_t action_ret)
 {
        static int count = 100;
 
@@ -135,12 +133,12 @@ report_bad_irq(unsigned int irq, struct irq_desc *desc, irqreturn_t action_ret)
        }
 }
 
-void note_interrupt(unsigned int irq, struct irq_desc *desc,
-                   irqreturn_t action_ret, struct pt_regs *regs)
+void note_interrupt(unsigned int irq, irq_desc_t *desc, irqreturn_t action_ret,
+                       struct pt_regs *regs)
 {
-       if (unlikely(action_ret != IRQ_HANDLED)) {
+       if (action_ret != IRQ_HANDLED) {
                desc->irqs_unhandled++;
-               if (unlikely(action_ret != IRQ_NONE))
+               if (action_ret != IRQ_NONE)
                        report_bad_irq(irq, desc, action_ret);
        }
 
@@ -154,11 +152,11 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc,
        }
 
        desc->irq_count++;
-       if (likely(desc->irq_count < 100000))
+       if (desc->irq_count < 100000)
                return;
 
        desc->irq_count = 0;
-       if (unlikely(desc->irqs_unhandled > 99900)) {
+       if (desc->irqs_unhandled > 99900) {
                /*
                 * The interrupt is stuck
                 */
@@ -168,19 +166,17 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc,
                 */
                printk(KERN_EMERG "Disabling IRQ #%d\n", irq);
                desc->status |= IRQ_DISABLED;
-               desc->depth = 1;
-               desc->chip->disable(irq);
+               desc->handler->disable(irq);
        }
        desc->irqs_unhandled = 0;
 }
 
-int noirqdebug __read_mostly;
+int noirqdebug;
 
 int __init noirqdebug_setup(char *str)
 {
        noirqdebug = 1;
        printk(KERN_INFO "IRQ lockup detection disabled\n");
-
        return 1;
 }
 
@@ -191,7 +187,6 @@ static int __init irqfixup_setup(char *str)
        irqfixup = 1;
        printk(KERN_WARNING "Misrouted IRQ fixup support enabled.\n");
        printk(KERN_WARNING "This may impact system performance.\n");
-
        return 1;
 }