lkml.org 
[lkml]   [2012]   [Feb]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: linux-next: manual merge of the irqdomain tree with the powerpc tree
    [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
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2012-02-24 06:33    [W:4.928 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site