62 lines
2.0 KiB
Diff
62 lines
2.0 KiB
Diff
From 5bcd48d8586935f02c89d96ca15dae8f144dd790 Mon Sep 17 00:00:00 2001
|
|
From: Stephen Rothwell <sfr@canb.auug.org.au>
|
|
Date: Thu, 29 Sep 2022 22:01:05 +0800
|
|
Subject: [PATCH 10/19] hwtracing: hisi_ptt: Fix up for "iommu/dma: Make header
|
|
private"
|
|
|
|
mainline inclusion
|
|
from mainline-v6.1-rc1
|
|
commit 5fc1531dd771cd1481116a66f992a190e01efce6
|
|
category: bugfix
|
|
bugzilla: https://gitee.com/openeuler/kernel/issues/I5RP8T
|
|
CVE: NA
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git/commit/?id=5fc1531dd771cd1481116a66f992a190e01efce6
|
|
|
|
--------------------------------------------------------------------------
|
|
|
|
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>
|
|
Signed-off-by: YunYi Yang <yangyunyi2@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 cffc625665a2..70d3398d341f 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>
|
|
--
|
|
2.27.0
|
|
|