Skip to content

Commit

Permalink
MIPS: BCM1480: Re-apply patch lost due to bad resolution of merge con…
Browse files Browse the repository at this point in the history
…flict.

Patch 14275ccdb1e4b487cca745aba994699c426a31ee and
d5dedd4 are conflicting and the
conflict was resolved badly in merge
92241940be501f798cb21db344bbb3d1ec3c4f1c resulting in the BCM1480 changes
of 14275ccdb1e4b487cca745aba994699c426a31ee getting lost.  Sort out the
damage.

Reported and initial patch by Mark Mason <mmason@upwardaccess.com>.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Ralf Baechle committed Sep 30, 2009
1 parent 9fcd66e commit 0863be2
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions arch/mips/sibyte/bcm1480/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,6 @@ static int bcm1480_set_affinity(unsigned int irq, const struct cpumask *mask)
unsigned long flags;
unsigned int irq_dirty;

if (cpumask_weight(mask) != 1) {
printk("attempted to set irq affinity for irq %d to multiple CPUs\n", irq);
return -1;
}
i = cpumask_first(mask);

/* Convert logical CPU to physical CPU */
Expand Down

0 comments on commit 0863be2

Please sign in to comment.