[PATCH 2/2] irqdomain/powerpc: Fix broken NR_IRQ references

Michael Ellerman michael at ellerman.id.au
Thu Apr 19 10:45:01 EST 2012


On Mon, 2012-04-16 at 14:13 -0600, Grant Likely wrote:

> diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c
> index d09f3e8..fc9df1a 100644
> --- a/arch/powerpc/platforms/cell/axon_msi.c
> +++ b/arch/powerpc/platforms/cell/axon_msi.c
> @@ -276,9 +276,6 @@ static int axon_msi_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
>  	if (rc)
>  		return rc;
>  
> -	/* We rely on being able to stash a virq in a u16 */

Would be nice to move the comment to the hunk below rather than just
deleting it. Otherwise the 65536 looks a bit random.

> -	BUILD_BUG_ON(NR_IRQS > 65536);
> -
>  	list_for_each_entry(entry, &dev->msi_list, list) {
>  		virq = irq_create_direct_mapping(msic->irq_domain);
>  		if (virq == NO_IRQ) {
> @@ -392,7 +389,7 @@ static int axon_msi_probe(struct platform_device *device)
>  	}
>  	memset(msic->fifo_virt, 0xff, MSIC_FIFO_SIZE_BYTES);
>  
> -	msic->irq_domain = irq_domain_add_nomap(dn, 0, &msic_host_ops, msic);
> +	msic->irq_domain = irq_domain_add_nomap(dn, 65536, &msic_host_ops, msic);
>  	if (!msic->irq_domain) {
>  		printk(KERN_ERR "axon_msi: couldn't allocate irq_domain for %s\n",
>  		       dn->full_name);

cheers



More information about the Linuxppc-dev mailing list