X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=kernel%2Firq%2Fmigration.c;h=77b7acc875c5df6755954161736b72918fff49ad;hb=489de30259e667d7bc47da9da44a0270b050cd97;hp=a12d00eb5e7c01e9495704fbfdae248ab081ed8e;hpb=199f4c9f76fd8b030405abddf294e771f888de03;p=linux-2.6-omap-h63xx.git

diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c
index a12d00eb5e7..77b7acc875c 100644
--- a/kernel/irq/migration.c
+++ b/kernel/irq/migration.c
@@ -3,21 +3,21 @@
 
 void set_pending_irq(unsigned int irq, cpumask_t mask)
 {
-	irq_desc_t *desc = irq_desc + irq;
+	struct irq_desc *desc = irq_desc + irq;
 	unsigned long flags;
 
 	spin_lock_irqsave(&desc->lock, flags);
-	desc->move_irq = 1;
-	pending_irq_cpumask[irq] = mask;
+	desc->status |= IRQ_MOVE_PENDING;
+	irq_desc[irq].pending_mask = mask;
 	spin_unlock_irqrestore(&desc->lock, flags);
 }
 
-void move_native_irq(int irq)
+void move_masked_irq(int irq)
 {
+	struct irq_desc *desc = irq_desc + irq;
 	cpumask_t tmp;
-	irq_desc_t *desc = irq_descp(irq);
 
-	if (likely(!desc->move_irq))
+	if (likely(!(desc->status & IRQ_MOVE_PENDING)))
 		return;
 
 	/*
@@ -28,17 +28,17 @@ 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(cpus_empty(irq_desc[irq].pending_mask)))
 		return;
 
-	if (!desc->handler->set_affinity)
+	if (!desc->chip->set_affinity)
 		return;
 
 	assert_spin_locked(&desc->lock);
 
-	cpus_and(tmp, pending_irq_cpumask[irq], cpu_online_map);
+	cpus_and(tmp, irq_desc[irq].pending_mask, cpu_online_map);
 
 	/*
 	 * If there was a valid mask to work with, please
@@ -48,15 +48,28 @@ 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->handler->disable(irq);
+		desc->chip->set_affinity(irq,tmp);
+	}
+	cpus_clear(irq_desc[irq].pending_mask);
+}
 
-		desc->handler->set_affinity(irq,tmp);
+void move_native_irq(int irq)
+{
+	struct irq_desc *desc = irq_desc + irq;
 
-		if (likely(!(desc->status & IRQ_DISABLED)))
-			desc->handler->enable(irq);
-	}
-	cpus_clear(pending_irq_cpumask[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);
 }
+