Commit 70590ea7 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar

pci/intr_remapping: Allocate irq_iommu on node

make it use the node from irq_desc.
Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Acked-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <4A95C392.5050903@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 5bfb5b51
...@@ -55,15 +55,12 @@ static struct irq_2_iommu *irq_2_iommu(unsigned int irq) ...@@ -55,15 +55,12 @@ static struct irq_2_iommu *irq_2_iommu(unsigned int irq)
return desc->irq_2_iommu; 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_desc *desc;
struct irq_2_iommu *irq_iommu; struct irq_2_iommu *irq_iommu;
/* desc = irq_to_desc(irq);
* alloc irq desc if not allocated already.
*/
desc = irq_to_desc_alloc_node(irq, node);
if (!desc) { if (!desc) {
printk(KERN_INFO "can not get irq_desc for %d\n", irq); printk(KERN_INFO "can not get irq_desc for %d\n", irq);
return NULL; return NULL;
...@@ -72,16 +69,11 @@ static struct irq_2_iommu *irq_2_iommu_alloc_node(unsigned int irq, int node) ...@@ -72,16 +69,11 @@ static struct irq_2_iommu *irq_2_iommu_alloc_node(unsigned int irq, int node)
irq_iommu = desc->irq_2_iommu; irq_iommu = desc->irq_2_iommu;
if (!irq_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; 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 */ #else /* !CONFIG_SPARSE_IRQ */
static struct irq_2_iommu irq_2_iommuX[NR_IRQS]; static struct irq_2_iommu irq_2_iommuX[NR_IRQS];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment