diff options
Diffstat (limited to 'arch/powerpc/sysdev/xive')
| -rw-r--r-- | arch/powerpc/sysdev/xive/Kconfig | 1 | ||||
| -rw-r--r-- | arch/powerpc/sysdev/xive/common.c | 7 | 
2 files changed, 4 insertions, 4 deletions
| diff --git a/arch/powerpc/sysdev/xive/Kconfig b/arch/powerpc/sysdev/xive/Kconfig index 785c292d104b..97796c6b63f0 100644 --- a/arch/powerpc/sysdev/xive/Kconfig +++ b/arch/powerpc/sysdev/xive/Kconfig @@ -3,6 +3,7 @@ config PPC_XIVE  	bool  	select PPC_SMP_MUXED_IPI  	select HARDIRQS_SW_RESEND +	select IRQ_DOMAIN_NOMAP  config PPC_XIVE_NATIVE  	bool diff --git a/arch/powerpc/sysdev/xive/common.c b/arch/powerpc/sysdev/xive/common.c index a8304327072d..dbdbbc2f1dc5 100644 --- a/arch/powerpc/sysdev/xive/common.c +++ b/arch/powerpc/sysdev/xive/common.c @@ -1153,11 +1153,10 @@ static int __init xive_request_ipi(void)  		 * Since the HW interrupt number doesn't have any meaning,  		 * simply use the node number.  		 */ -		xid->irq = irq_domain_alloc_irqs(ipi_domain, 1, node, &info); -		if (xid->irq < 0) { -			ret = xid->irq; +		ret = irq_domain_alloc_irqs(ipi_domain, 1, node, &info); +		if (ret < 0)  			goto out_free_xive_ipis; -		} +		xid->irq = ret;  		snprintf(xid->name, sizeof(xid->name), "IPI-%d", node); |