On Mon, Sep 21, 2009 at 02:13:24PM -0700, Mark Mason wrote:
> arch/mips/sibyte/bcm1480/irq.c | 6 +++++-
> 1 files changed, 5 insertions(+), 1 deletions(-)
>
> diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c
> index ba59839..fc87ea4 100644
> --- a/arch/mips/sibyte/bcm1480/irq.c
> +++ b/arch/mips/sibyte/bcm1480/irq.c
> @@ -118,7 +118,11 @@ static int bcm1480_set_affinity(unsigned int irq, const struct cpumask *mask)
> unsigned int irq_dirty;
>
> if (cpumask_weight(mask) != 1) {
> - printk("attempted to set irq affinity for irq %d to multiple CPUs\n", irq);
> + printk("attempted to set irq affinity for irq %d to multiple CPUs:", irq);
> + /* Print the mask */
> + for_each_cpu(i, mask)
> + printk(" %d", i);
> + printk("\n");
The whole if block is a zombie that was supposed to have been
removed by commit 14275ccdb1e4b487cca745aba994699c426a31ee but then
returned in 92241940be501f798cb21db344bbb3d1ec3c4f1c. So I went for a
slightly different patch, see below.
Thanks,
Ralf
MIPS: BCM1480: Re-apply patch lost due to bad resolution of merge conflict.
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@xxxxxxxxxxxxxxxx>.
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c
index ba59839..4070268 100644
--- 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 */
