Hi all,
After merging the pci tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
drivers/iommu/apple-dart.c: In function 'apple_dart_get_resv_regions':
drivers/iommu/apple-dart.c:762:2: error: implicit declaration of function 'iommu_dma_get_resv_regions'; did you mean 'iommu_get_resv_regions'? [-Werror=implicit-function-declaration]
762 | iommu_dma_get_resv_regions(dev, head);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
| iommu_get_resv_regions
Caused by commit
946d619fa25f ("iommu/dart: Exclude MSI doorbell from PCIe device IOVA range")
Unfortunately, the linux/dma-iommu.h include was removed by commit
b2b2781a9755 ("iommu/dart: Clean up IOVA cookie crumbs")
which is now in Linus' tree.
I have added this merge fixup for today:
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 5 Nov 2021 09:51:19 +1100
Subject: [PATCH] iommu/dart: restore include of linux/dma-iommu.h
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
drivers/iommu/apple-dart.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/iommu/apple-dart.c b/drivers/iommu/apple-dart.c
index b7265a8e9540..565ef5598811 100644
--- a/drivers/iommu/apple-dart.c
+++ b/drivers/iommu/apple-dart.c
@@ -15,6 +15,7 @@
#include <linux/bitfield.h>
#include <linux/clk.h>
#include <linux/dev_printk.h>
+#include <linux/dma-iommu.h>
#include <linux/dma-mapping.h>
#include <linux/err.h>
#include <linux/interrupt.h>
--
2.33.0
--
Cheers,
Stephen Rothwell
Attachment:
pgp5SiaEAoCsy.pgp
Description: OpenPGP digital signature
