Re: [PATCH] pci/intr_remapping: allocate irq_iommu on node -v3

[Jesse Barnes <jbarnes@virtuousgeek.org>]

Ingo, I assume you took these two?

Thanks,
Jesse

On Thu, 13 Aug 2009 18:47:06 -0700
Yinghai Lu <yinghai@kernel.org> wrote:

> 
> make it use node from irq_desc.
> v3: use irq_node
> 
> Signed-off-by: Yinghai Lu <yinghai@kernel.org>
> 
> ---
>  drivers/pci/intr_remapping.c |   14 +++-----------
>  1 file changed, 3 insertions(+), 11 deletions(-)
> 
> Index: linux-2.6/drivers/pci/intr_remapping.c
> ===================================================================
> --- linux-2.6.orig/drivers/pci/intr_remapping.c
> +++ linux-2.6/drivers/pci/intr_remapping.c
> @@ -55,15 +55,12 @@ static struct irq_2_iommu *irq_2_iommu(u
>  	return desc->irq_2_iommu;
>  }
>  
> -static struct irq_2_iommu *irq_2_iommu_alloc_node(unsigned int irq,
> int node) +static struct irq_2_iommu *irq_2_iommu_alloc(unsigned int
> irq) {
>  	struct irq_desc *desc;
>  	struct irq_2_iommu *irq_iommu;
>  
> -	/*
> -	 * alloc irq desc if not allocated already.
> -	 */
> -	desc = irq_to_desc_alloc_node(irq, node);
> +	desc = irq_to_desc(irq);
>  	if (!desc) {
>  		printk(KERN_INFO "can not get irq_desc for %d\n",
> irq); return NULL;
> @@ -72,16 +69,11 @@ static struct irq_2_iommu *irq_2_iommu_a
>  	irq_iommu = desc->irq_2_iommu;
>  
>  	if (!irq_iommu)
> -		desc->irq_2_iommu = get_one_free_irq_2_iommu(node);
> +		desc->irq_2_iommu =
> get_one_free_irq_2_iommu(irq_node(irq)); 
>  	return desc->irq_2_iommu;
>  }
>  
> -static struct irq_2_iommu *irq_2_iommu_alloc(unsigned int irq)
> -{
> -	return irq_2_iommu_alloc_node(irq, cpu_to_node(boot_cpu_id));
> -}
> -
>  #else /* !CONFIG_SPARSE_IRQ */
>  
>  static struct irq_2_iommu irq_2_iommuX[NR_IRQS];
> 


-- 
Jesse Barnes, Intel Open Source Technology Center