X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=kernel%2Firq%2Fmigration.c;h=241962280836ff73e8143dc8ebc63a83f53d9115;hb=4434ade8c9334a3ab975d8993de456f06841899e;hp=b4a4354d03d582ccf7e109a61e7e455b5f50e38d;hpb=a8553acd6c14e827078779c0a0ee1c18f27b2403;p=safe%2Fjmp%2Flinux-2.6

diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c
index b4a4354..2419622 100644
--- a/kernel/irq/migration.c
+++ b/kernel/irq/migration.c
@@ -1,23 +1,14 @@
 
 #include <linux/irq.h>
+#include <linux/interrupt.h>
 
-void set_pending_irq(unsigned int irq, cpumask_t mask)
-{
-	irq_desc_t *desc = irq_desc + irq;
-	unsigned long flags;
-
-	spin_lock_irqsave(&desc->lock, flags);
-	desc->move_irq = 1;
-	pending_irq_cpumask[irq] = mask;
-	spin_unlock_irqrestore(&desc->lock, flags);
-}
+#include "internals.h"
 
-void move_native_irq(int irq)
+void move_masked_irq(int irq)
 {
-	cpumask_t tmp;
-	irq_desc_t *desc = irq_desc + irq;
+	struct irq_desc *desc = irq_to_desc(irq);
 
-	if (likely(!desc->move_irq))
+	if (likely(!(desc->status & IRQ_MOVE_PENDING)))
 		return;
 
 	/*
@@ -28,17 +19,15 @@ void move_native_irq(int irq)
 		return;
 	}
 
-	desc->move_irq = 0;
+	desc->status &= ~IRQ_MOVE_PENDING;
 
-	if (unlikely(cpus_empty(pending_irq_cpumask[irq])))
+	if (unlikely(cpumask_empty(desc->pending_mask)))
 		return;
 
 	if (!desc->chip->set_affinity)
 		return;
 
-	assert_spin_locked(&desc->lock);
-
-	cpus_and(tmp, pending_irq_cpumask[irq], cpu_online_map);
+	assert_raw_spin_locked(&desc->lock);
 
 	/*
 	 * If there was a valid mask to work with, please
@@ -48,15 +37,32 @@ void move_native_irq(int irq)
 	 * when an active trigger is comming in. This could
 	 * cause some ioapics to mal-function.
 	 * Being paranoid i guess!
+	 *
+	 * For correct operation this depends on the caller
+	 * masking the irqs.
 	 */
-	if (likely(!cpus_empty(tmp))) {
-		if (likely(!(desc->status & IRQ_DISABLED)))
-			desc->chip->disable(irq);
+	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);
+		}
 
-		desc->chip->set_affinity(irq,tmp);
+	cpumask_clear(desc->pending_mask);
+}
 
-		if (likely(!(desc->status & IRQ_DISABLED)))
-			desc->chip->enable(irq);
-	}
-	cpus_clear(pending_irq_cpumask[irq]);
+void move_native_irq(int irq)
+{
+	struct irq_desc *desc = irq_to_desc(irq);
+
+	if (likely(!(desc->status & IRQ_MOVE_PENDING)))
+		return;
+
+	if (unlikely(desc->status & IRQ_DISABLED))
+		return;
+
+	desc->chip->mask(irq);
+	move_masked_irq(irq);
+	desc->chip->unmask(irq);
 }
+