linux-kernel - linux-next: manual merge of the irqdomain tree with the powerpc tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20120224162504.49480de981431c3fd95601a2@canb.auug.org.au>
Date:	Fri, 24 Feb 2012 16:25:04 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Grant Likely <grant.likely@...retlab.ca>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Kyle Moffett <Kyle.D.Moffett@...ing.com>
Subject: linux-next: manual merge of the irqdomain tree with the powerpc
 tree

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@...b.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

Content of type "application/pgp-signature" skipped