From: Ralf Baechle <ralf@linux-mips.org>
Date: Wed, 17 Jun 2009 10:06:24 +0000 (+0100)
Subject: MIPS: SB1250: Sort out merge mistake.
X-Git-Tag: firefly_0821_release~13881^2~43
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7762f206a3f3a19a38ed91a3d87f019d8b4eafc1;p=firefly-linux-kernel-4.4.55.git

MIPS: SB1250: Sort out merge mistake.

A wrong resolution of a merge conflict made the recently deleted wrong
error check in sb1250_set_affinity.  Send the zombie back to the empire
of the undead.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

diff --git a/arch/mips/sibyte/sb1250/irq.c b/arch/mips/sibyte/sb1250/irq.c
index 409dec798863..5e7f2016cceb 100644
--- a/arch/mips/sibyte/sb1250/irq.c
+++ b/arch/mips/sibyte/sb1250/irq.c
@@ -111,11 +111,6 @@ static int sb1250_set_affinity(unsigned int irq, const struct cpumask *mask)
 
 	i = cpumask_first(mask);
 
-	if (cpumask_weight(mask) > 1) {
-		printk("attempted to set irq affinity for irq %d to multiple CPUs\n", irq);
-		return -1;
-	}
-
 	/* Convert logical CPU to physical CPU */
 	cpu = cpu_logical_map(i);