On 2022-09-12 06:42, Stephen Rothwell wrote:
Hi all,
After merging the coresight tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/hwtracing/ptt/hisi_ptt.c:13:10: fatal error: linux/dma-iommu.h: No such file or directory
13 | #include <linux/dma-iommu.h>
| ^~~~~~~~~~~~~~~~~~~
Caused by commit
ff0de066b463 ("hwtracing: hisi_ptt: Add trace function support for HiSilicon PCIe Tune and Trace device")
interacting with commit
f2042ed21da7 ("iommu/dma: Make header private")
from the iommu tree.
Since the public interfaces in dna-iommu.h were moved to iommu.h, I have
applied the following merge fix patch:
In fact it's not even using those interfaces anyway, so never had any
reason to include dma-iommu.h in the first place, and Mathieu can make
this fix in the Coresight tree as-is. FWIW,
Acked-by: Robin Murphy <robin.murphy@xxxxxxx>
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 12 Sep 2022 15:35:37 +1000
Subject: [PATCH] hwtracing: hihi_ptt: fix up for "iommu/dma: Make header private"
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
drivers/hwtracing/ptt/hisi_ptt.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/hwtracing/ptt/hisi_ptt.c b/drivers/hwtracing/ptt/hisi_ptt.c
index 666a0f14b6c4..5d5526aa60c4 100644
--- a/drivers/hwtracing/ptt/hisi_ptt.c
+++ b/drivers/hwtracing/ptt/hisi_ptt.c
@@ -10,7 +10,6 @@
#include <linux/bitops.h>
#include <linux/cpuhotplug.h>
#include <linux/delay.h>
-#include <linux/dma-iommu.h>
#include <linux/dma-mapping.h>
#include <linux/interrupt.h>
#include <linux/io.h>
