Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[karo-tx-linux.git] / kernel / irq / migration.c

diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c
index 441fd629ff04b41db0bb044f06163f5dd8c08c58..47420908fba0a97df65676862df84fd63fdeb839 100644 (file)
--- a/kernel/irq/migration.c
+++ b/kernel/irq/migration.c
@@ -4,23 +4,23 @@
 
 #include "internals.h"
 
-void move_masked_irq(int irq)
+void irq_move_masked_irq(struct irq_data *idata)
 {
-       struct irq_desc *desc = irq_to_desc(irq);
-       struct irq_chip *chip = desc->irq_data.chip;
+       struct irq_desc *desc = irq_data_to_desc(idata);
+       struct irq_chip *chip = idata->chip;
 
-       if (likely(!(desc->status & IRQ_MOVE_PENDING)))
+       if (likely(!irqd_is_setaffinity_pending(&desc->irq_data)))
                return;
 
        /*
         * Paranoia: cpu-local interrupts shouldn't be calling in here anyway.
         */
-       if (CHECK_IRQ_PER_CPU(desc->status)) {
+       if (!irqd_can_balance(&desc->irq_data)) {
                WARN_ON(1);
                return;
        }
 
-       desc->status &= ~IRQ_MOVE_PENDING;
+       irqd_clr_move_pending(&desc->irq_data);
 
        if (unlikely(cpumask_empty(desc->pending_mask)))
                return;
@@ -35,7 +35,7 @@ void move_masked_irq(int irq)
         * do the disable, re-program, enable sequence.
         * This is *not* particularly important for level triggered
         * but in a edge trigger case, we might be setting rte
-        * when an active trigger is comming in. This could
+        * when an active trigger is coming in. This could
         * cause some ioapics to mal-function.
         * Being paranoid i guess!
         *
@@ -53,15 +53,14 @@ void move_masked_irq(int irq)
        cpumask_clear(desc->pending_mask);
 }
 
-void move_native_irq(int irq)
+void irq_move_irq(struct irq_data *idata)
 {
-       struct irq_desc *desc = irq_to_desc(irq);
        bool masked;
 
-       if (likely(!(desc->status & IRQ_MOVE_PENDING)))
+       if (likely(!irqd_is_setaffinity_pending(idata)))
                return;
 
-       if (unlikely(desc->status & IRQ_DISABLED))
+       if (unlikely(irqd_irq_disabled(idata)))
                return;
 
        /*
@@ -69,10 +68,10 @@ void move_native_irq(int irq)
         * threaded interrupt with ONESHOT set, we can end up with an
         * interrupt storm.
         */
-       masked = desc->status & IRQ_MASKED;
+       masked = irqd_irq_masked(idata);
        if (!masked)
-               desc->irq_data.chip->irq_mask(&desc->irq_data);
-       move_masked_irq(irq);
+               idata->chip->irq_mask(idata);
+       irq_move_masked_irq(idata);
        if (!masked)
-               desc->irq_data.chip->irq_unmask(&desc->irq_data);
+               idata->chip->irq_unmask(idata);
 }