diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2009-06-17 11:06:24 +0100 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2009-06-17 11:06:24 +0100 |
| commit | 7762f206a3f3a19a38ed91a3d87f019d8b4eafc1 (patch) | |
| tree | 1851c6ecb724ecc8853459c9233cc90f47bc47b1 /arch/mips/sibyte | |
| parent | 3cb3a66cf7559d9c5d47ddf58481530b8943052f (diff) | |
| download | linux-7762f206a3f3a19a38ed91a3d87f019d8b4eafc1.tar.gz linux-7762f206a3f3a19a38ed91a3d87f019d8b4eafc1.tar.bz2 linux-7762f206a3f3a19a38ed91a3d87f019d8b4eafc1.zip | |
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')
| -rw-r--r-- | arch/mips/sibyte/sb1250/irq.c | 5 |
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) 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); |