aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/sibyte/sb1250
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2009-06-17 06:06:24 -0400
committerRalf Baechle <ralf@linux-mips.org>2009-06-17 06:06:24 -0400
commit7762f206a3f3a19a38ed91a3d87f019d8b4eafc1 (patch)
tree1851c6ecb724ecc8853459c9233cc90f47bc47b1 /arch/mips/sibyte/sb1250
parent3cb3a66cf7559d9c5d47ddf58481530b8943052f (diff)
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>
Diffstat (limited to 'arch/mips/sibyte/sb1250')
-rw-r--r--arch/mips/sibyte/sb1250/irq.c5
1 files changed, 0 insertions, 5 deletions
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)
111 111
112 i = cpumask_first(mask); 112 i = cpumask_first(mask);
113 113
114 if (cpumask_weight(mask) > 1) {
115 printk("attempted to set irq affinity for irq %d to multiple CPUs\n", irq);
116 return -1;
117 }
118
119 /* Convert logical CPU to physical CPU */ 114 /* Convert logical CPU to physical CPU */
120 cpu = cpu_logical_map(i); 115 cpu = cpu_logical_map(i);
121 116