---

yaml --- r: 234741 b: refs/heads/master c: fae581e h: refs/heads/master i: 234739: 0a71c16 v: v3
git-mirror · Feb 19, 2011 · 4ef73d7 · 4ef73d7
1 parent 0ca616e
commit 4ef73d7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f53f92404bead2ab2154d45c8f508880bb5d95d
+refs/heads/master: fae581e588e64a0690f3fc995e404fcacaebe772
diff --git a/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c
@@ -73,8 +73,8 @@ int irq_can_set_affinity(unsigned int irq)
 {
 	struct irq_desc *desc = irq_to_desc(irq);
 
-	if (CHECK_IRQ_PER_CPU(desc->status) || !desc->irq_data.chip ||
-	    !desc->irq_data.chip->irq_set_affinity)
+	if ((desc->status & (IRQ_PER_CPU | IRQ_NO_BALANCING)) ||
+	    !desc->irq_data.chip || !desc->irq_data.chip->irq_set_affinity)
 		return 0;
 
 	return 1;

diff --git a/trunk/kernel/irq/migration.c b/trunk/kernel/irq/migration.c
@@ -15,7 +15,7 @@ void move_masked_irq(int irq)
 	/*
 	 * Paranoia: cpu-local interrupts shouldn't be calling in here anyway.
 	 */
-	if (CHECK_IRQ_PER_CPU(desc->status)) {
+	if (desc->status & (IRQ_PER_CPU | IRQ_NO_BALANCING)) {
 		WARN_ON(1);
 		return;
 	}