ALSA: usb-audio: add support for Akai MPD16

[safe/jmp/linux-2.6] / kernel / irq / migration.c

diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c
index 4baa3bb..2419622 100644 (file)
--- a/kernel/irq/migration.c
+++ b/kernel/irq/migration.c
@@ -1,21 +1,12 @@
 
 #include <linux/irq.h>
+#include <linux/interrupt.h>
 
-void set_pending_irq(unsigned int irq, cpumask_t mask)
-{
-       struct irq_desc *desc = irq_desc + irq;
-       unsigned long flags;
-
-       spin_lock_irqsave(&desc->lock, flags);
-       desc->status |= IRQ_MOVE_PENDING;
-       irq_desc[irq].pending_mask = mask;
-       spin_unlock_irqrestore(&desc->lock, flags);
-}
+#include "internals.h"
 
 void move_masked_irq(int irq)
 {
-       struct irq_desc *desc = irq_desc + irq;
-       cpumask_t tmp;
+       struct irq_desc *desc = irq_to_desc(irq);
 
        if (likely(!(desc->status & IRQ_MOVE_PENDING)))
                return;
@@ -30,15 +21,13 @@ void move_masked_irq(int irq)
 
        desc->status &= ~IRQ_MOVE_PENDING;
 
-       if (unlikely(cpus_empty(irq_desc[irq].pending_mask)))
+       if (unlikely(cpumask_empty(desc->pending_mask)))
                return;
 
        if (!desc->chip->set_affinity)
                return;
 
-       assert_spin_locked(&desc->lock);
-
-       cpus_and(tmp, irq_desc[irq].pending_mask, cpu_online_map);
+       assert_raw_spin_locked(&desc->lock);
 
        /*
         * If there was a valid mask to work with, please
@@ -52,25 +41,28 @@ void move_masked_irq(int irq)
         * For correct operation this depends on the caller
         * masking the irqs.
         */
-       if (likely(!cpus_empty(tmp))) {
-               desc->chip->set_affinity(irq,tmp);
-       }
-       cpus_clear(irq_desc[irq].pending_mask);
+       if (likely(cpumask_any_and(desc->pending_mask, cpu_online_mask)
+                  < nr_cpu_ids))
+               if (!desc->chip->set_affinity(irq, desc->pending_mask)) {
+                       cpumask_copy(desc->affinity, desc->pending_mask);
+                       irq_set_thread_affinity(desc);
+               }
+
+       cpumask_clear(desc->pending_mask);
 }
 
 void move_native_irq(int irq)
 {
-       struct irq_desc *desc = irq_desc + irq;
+       struct irq_desc *desc = irq_to_desc(irq);
 
        if (likely(!(desc->status & IRQ_MOVE_PENDING)))
                return;
 
-       if (likely(!(desc->status & IRQ_DISABLED)))
-               desc->chip->disable(irq);
+       if (unlikely(desc->status & IRQ_DISABLED))
+               return;
 
+       desc->chip->mask(irq);
        move_masked_irq(irq);
-
-       if (likely(!(desc->status & IRQ_DISABLED)))
-               desc->chip->enable(irq);
+       desc->chip->unmask(irq);
 }