From: Mark Mason <mmason@upwardaccess.com>
Date: Mon, 26 Mar 2007 20:28:26 +0000 (-0700)
Subject: [MIPS] BCM1480: Fix setting of irq affinity.
X-Git-Tag: v2.6.21-rc6~45^2~1
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=6c9fde4bfff11b2fd93b4e518ae7ecb25a9244e4;p=linux-block.git

[MIPS] BCM1480: Fix setting of irq affinity.

Signed-off-by: Mark Mason <mason@broadcom.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c
index 20af0f1bb7bf..ba0c4b776c85 100644
--- a/arch/mips/sibyte/bcm1480/irq.c
+++ b/arch/mips/sibyte/bcm1480/irq.c
@@ -141,11 +141,11 @@ static void bcm1480_set_affinity(unsigned int irq, cpumask_t mask)
 	unsigned long flags;
 	unsigned int irq_dirty;
 
-	i = first_cpu(mask);
-	if (next_cpu(i, mask) <= NR_CPUS) {
+	if (cpus_weight(mask) != 1) {
 		printk("attempted to set irq affinity for irq %d to multiple CPUs\n", irq);
 		return;
 	}
+	i = first_cpu(mask);
 
 	/* Convert logical CPU to physical CPU */
 	cpu = cpu_logical_map(i);