From: Stephen Rothwell sfr@canb.auug.org.au
mainline inclusion from mainline-remotes/origin/next commit 366317eae983a0d96aeed78ad219b9c4ed2a719a category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I5RP8T CVE: NA
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git/commit/?...
--------------------------------------------------------------------------
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.
Signed-off-by: Stephen Rothwell sfr@canb.auug.org.au Acked-by: Robin Murphy robin.murphy@arm.com Acked-by: Yicong Yang yangyicong@hisilicon.com [Fixed subject line and added changelog text] Signed-off-by: Mathieu Poirier mathieu.poirier@linaro.org Signed-off-by: Wangming Shao shaowangming@h-partners.com Reviewed-by: Xiongfeng Wang wangxiongfeng2@huawei.com Reviewed-by: Jay Fang f.fangjian@huawei.com Acked-by: Xie XiuQi xiexiuqi@huawei.com Signed-off-by: Zheng Zengkai zhengzengkai@huawei.com --- 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>