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

[Stephen Rothwell]

Hi all,

After merging the pm tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/virtio/virtio_mmio.c: In function 'vm_find_vqs':
drivers/virtio/virtio_mmio.c:492:13: error: implicit declaration of function 'of_property_read_bool'; did you mean 'fwnode_property_read_bool'? [-Werror=implicit-function-declaration]
  492 |         if (of_property_read_bool(vm_dev->pdev->dev.of_node, "wakeup-source"))
      |             ^~~~~~~~~~~~~~~~~~~~~
      |             fwnode_property_read_bool

Caused by commit (I am pretty sure, but can't see why)

  054e68aae050 ("ACPI: Replace irqdomain.h include with struct declarations")

I have applied the following patch for today (and it could be applied
to the pm tree).

From f920b59d2ca8dcbe8d80f103e109032800c699be Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 3 Apr 2023 11:11:09 +1000
Subject: [PATCH] virtio_mmio: fix up for "ACPI: Replace irqdomain.h include
 with struct declarations"

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 drivers/virtio/virtio_mmio.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
index 3ff746e3f24a..06f1ecff2a3a 100644
--- a/drivers/virtio/virtio_mmio.c
+++ b/drivers/virtio/virtio_mmio.c
@@ -55,6 +55,7 @@
 #define pr_fmt(fmt) "virtio-mmio: " fmt
 
 #include <linux/acpi.h>
+#include <linux/of.h>
 #include <linux/dma-mapping.h>
 #include <linux/highmem.h>
 #include <linux/interrupt.h>
-- 
2.39.2

-- 
Cheers,
Stephen Rothwell

Attachment: pgpbiiWuoQ4Xa.pgp
Description: OpenPGP digital signature