projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9fcd66e
)
MIPS: BCM1480: Re-apply patch lost due to bad resolution of merge conflict.
author
Ralf Baechle
<ralf@linux-mips.org>
Wed, 23 Sep 2009 20:37:08 +0000
(21:37 +0100)
committer
Ralf Baechle
<ralf@linux-mips.org>
Wed, 30 Sep 2009 19:46:59 +0000
(21:46 +0200)
Patch
14275ccdb1e4b487cca745aba994699c426a31ee
and
d5dedd4507d307eb3f35f21b6e16f336fdc0d82a
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>
arch/mips/sibyte/bcm1480/irq.c
patch
|
blob
|
blame
|
history
diff --git
a/arch/mips/sibyte/bcm1480/irq.c
b/arch/mips/sibyte/bcm1480/irq.c
index ba59839a021ee688b37761e54b8cd966abc537e5..4070268aa769826c46bb3c5328f398a71abc0283 100644
(file)
--- a/
arch/mips/sibyte/bcm1480/irq.c
+++ b/
arch/mips/sibyte/bcm1480/irq.c
@@
-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 */