aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/kernel/irq/ipi.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2016-07-04 12:26:05 +0200
committerThomas Gleixner <tglx@linutronix.de>2016-07-04 12:26:05 +0200
commit8658be133baa92c06b6d832a436d437deb2e2a22 (patch)
tree8f798f4aae5892533831487e4838a85b95414a0f /kernel/irq/ipi.c
parentMerge tag 'irqchip-core-4.8-2' of git://git.infradead.org/users/jcooper/linux into irq/core (diff)
parentgenirq: Add a helper to spread an affinity mask for MSI/MSI-X vectors (diff)
downloadwireguard-linux-8658be133baa92c06b6d832a436d437deb2e2a22.tar.xz
wireguard-linux-8658be133baa92c06b6d832a436d437deb2e2a22.zip
Merge branch 'irq/for-block' into irq/core
Pull the irq affinity managing code which is in a seperate branch for block developers to pull.
Diffstat (limited to 'kernel/irq/ipi.c')
-rw-r--r--kernel/irq/ipi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/ipi.c b/kernel/irq/ipi.c
index 89b49f6773f0..4fd23510d5f2 100644
--- a/kernel/irq/ipi.c
+++ b/kernel/irq/ipi.c
@@ -76,7 +76,7 @@ int irq_reserve_ipi(struct irq_domain *domain,
}
}
- virq = irq_domain_alloc_descs(-1, nr_irqs, 0, NUMA_NO_NODE);
+ virq = irq_domain_alloc_descs(-1, nr_irqs, 0, NUMA_NO_NODE, NULL);
if (virq <= 0) {
pr_warn("Can't reserve IPI, failed to alloc descs\n");
return -ENOMEM;