diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2023-02-23 15:49:31 +0100 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2023-02-23 15:49:31 +0100 |
commit | 5931e4eb55f904a4a221b57ff7d24afc0e463957 (patch) | |
tree | a6e51d12e3939d48470b75bc2bac28b337707076 /drivers/irqchip/irq-armada-370-xp.c | |
parent | ce7980ae9080f72f08d50355c4d9084d57aece63 (diff) | |
parent | 6f3ee0e22b4c62f44b8fa3c8de6e369a4d112a75 (diff) |
Merge branch 'irq/core' into irq/urgent
Pull in the upstream changes so a fix for them can be applied.
Diffstat (limited to 'drivers/irqchip/irq-armada-370-xp.c')
-rw-r--r-- | drivers/irqchip/irq-armada-370-xp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c index ee18eb3e72b7..a55528469278 100644 --- a/drivers/irqchip/irq-armada-370-xp.c +++ b/drivers/irqchip/irq-armada-370-xp.c @@ -454,8 +454,7 @@ static __init void armada_xp_ipi_init(struct device_node *node) return; irq_domain_update_bus_token(ipi_domain, DOMAIN_BUS_IPI); - base_ipi = __irq_domain_alloc_irqs(ipi_domain, -1, IPI_DOORBELL_END, - NUMA_NO_NODE, NULL, false, NULL); + base_ipi = irq_domain_alloc_irqs(ipi_domain, IPI_DOORBELL_END, NUMA_NO_NODE, NULL); if (WARN_ON(!base_ipi)) return; |