From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Grant Likely <grant.likely@secretlab.ca>
Cc: linux-kernel@vger.kernel.org, linux-next@vger.kernel.org,
Paul Mackerras <paulus@samba.org>,
Kyle Moffett <Kyle.D.Moffett@boeing.com>,
linuxppc-dev@lists.ozlabs.org
Subject: Re: linux-next: manual merge of the irqdomain tree with the powerpc tree
Date: Fri, 24 Feb 2012 16:30:42 +1100 [thread overview]
Message-ID: <20120224163042.4cc2633945c9799b997ff4e7@canb.auug.org.au> (raw)
In-Reply-To: <20120224162504.49480de981431c3fd95601a2@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1506 bytes --]
[Just adding the PPC guys]
On Fri, 24 Feb 2012 16:25:04 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Grant,
>
> Today's linux-next merge of the irqdomain tree got a conflict in
> arch/powerpc/sysdev/mpic.c between commits 3a7a7176e840 ("powerpc/mpic:
> Fix use of "flags" variable in mpic_alloc()") and c1b8d45db4db
> ("powerpc/mpic: Add "last-interrupt-source" property to override
> hardware") from the powerpc tree and commit a8db8cf0d894 ("irq_domain:
> Replace irq_alloc_host() with revmap-specific initializers") from the
> irqdomain tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/powerpc/sysdev/mpic.c
> index b9b989d,c83a512..0000000
> --- a/arch/powerpc/sysdev/mpic.c
> +++ b/arch/powerpc/sysdev/mpic.c
> @@@ -1351,9 -1345,9 +1351,8 @@@ struct mpic * __init mpic_alloc(struct
> mpic->isu_shift = 1 + __ilog2(mpic->isu_size - 1);
> mpic->isu_mask = (1 << mpic->isu_shift) - 1;
>
> - mpic->irqhost = irq_alloc_host(mpic->node, IRQ_HOST_MAP_LINEAR,
> - mpic->isu_size, &mpic_host_ops,
> - intvec_top + 1);
> + mpic->irqhost = irq_domain_add_linear(mpic->node,
> - isu_size ? isu_size : mpic->num_sources,
> - &mpic_host_ops, mpic);
> ++ mpic->isu_size, &mpic_host_ops, mpic);
>
> /*
> * FIXME: The code leaks the MPIC object and mappings here; this
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next parent reply other threads:[~2012-02-24 5:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20120224162504.49480de981431c3fd95601a2@canb.auug.org.au>
2012-02-24 5:30 ` Stephen Rothwell [this message]
2012-02-24 6:07 ` linux-next: manual merge of the irqdomain tree with the powerpc tree Grant Likely
2012-02-28 4:23 Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2012-03-09 6:48 Stephen Rothwell
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=20120224163042.4cc2633945c9799b997ff4e7@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Kyle.D.Moffett@boeing.com \
--cc=grant.likely@secretlab.ca \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=paulus@samba.org \
/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