linux-next: build failure after merge of the irqchip tree

[Stephen Rothwell]

Hi all,

After merging the irqchip tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

arch/powerpc/platforms/pseries/vas.c: In function 'allocate_setup_window':
arch/powerpc/platforms/pseries/vas.c:219:22: error: implicit declaration of function 'irq_create_mapping' [-Werror=implicit-function-declaration]
  219 |  txwin->fault_virq = irq_create_mapping(NULL, txwin->fault_irq);
      |                      ^~~~~~~~~~~~~~~~~~
arch/powerpc/platforms/pseries/vas.c:248:2: error: implicit declaration of function 'irq_dispose_mapping' [-Werror=implicit-function-declaration]
  248 |  irq_dispose_mapping(txwin->fault_virq);
      |  ^~~~~~~~~~~~~~~~~~~

Caused by commit

  582f5aa1dbb3 ("powerpc: Drop dependency between asm/irq.h and linux/irqdomain.h")

interacting with commit

  6d0aaf5e0de0 ("powerpc/pseries/vas: Setup IRQ and fault handling")

from the powerpc tree

I have applied the following merge fix patch for today.  This could, of
course, be applied directly to the powerpc tree ...

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Tue, 22 Jun 2021 14:10:44 +1000
Subject: [PATCH] powerpc: fix up for "Drop dependency between asm/irq.h and linux/irqdomain.h"

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 arch/powerpc/platforms/pseries/vas.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/powerpc/platforms/pseries/vas.c b/arch/powerpc/platforms/pseries/vas.c
index 3385b5400cc6..b5c1cf1bc64d 100644
--- a/arch/powerpc/platforms/pseries/vas.c
+++ b/arch/powerpc/platforms/pseries/vas.c
@@ -12,6 +12,7 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
+#include <linux/irqdomain.h>
 #include <asm/machdep.h>
 #include <asm/hvcall.h>
 #include <asm/plpar_wrappers.h>
-- 
2.30.2

-- 
Cheers,
Stephen Rothwell

Attachment: pgpBydrvZTvxa.pgp
Description: OpenPGP digital signature