From: Ralf Baechle <ralf@linux-mips.org>
To: Mark Mason <mmason@upwardaccess.com>
Cc: linux-mips@linux-mips.org
Subject: Re: [PATCH] When complaining about attempting to set the irq affinity to multiple cpus,
Date: Wed, 23 Sep 2009 21:50:04 +0100 [thread overview]
Message-ID: <20090923205004.GA21971@linux-mips.org> (raw)
In-Reply-To: <1253567604-6734-1-git-send-email-mmason@upwardaccess.com>
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@upwardaccess.com>.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
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 */
next prev parent reply other threads:[~2009-09-23 20:48 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-21 21:13 [PATCH] When complaining about attempting to set the irq affinity to multiple cpus, Mark Mason
2009-09-23 20:50 ` Ralf Baechle [this message]
[not found] ` <BD3F7F1EFBA6D54DB056C4FFA4514008037D6641C8@SJEXCHCCR01.corp.ad.broadcom.com>
2009-09-23 21:24 ` Ralf Baechle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090923205004.GA21971@linux-mips.org \
--to=ralf@linux-mips.org \
--cc=linux-mips@linux-mips.org \
--cc=mmason@upwardaccess.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).