diff options
| author | Joerg Roedel <jroedel@suse.de> | 2017-04-26 15:46:20 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2017-04-29 00:20:49 +0200 |
| commit | 461a6946b1f93f6720577fb06aa78e8cbd9291c9 (patch) | |
| tree | 0afe7fc6945f9ace8480ce3708c82c1e4c324bd4 | |
| parent | 207c6e36f122ebb1164d611c9f34f128313f47d5 (diff) | |
| download | op-kernel-dev-461a6946b1f93f6720577fb06aa78e8cbd9291c9.zip op-kernel-dev-461a6946b1f93f6720577fb06aa78e8cbd9291c9.tar.gz | |
iommu: Remove pci.h include from trace/events/iommu.h
The include file does not need any PCI specifics, so remove
that include. Also fix the places that relied on it.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
| -rw-r--r-- | arch/arm64/mm/dma-mapping.c | 1 | ||||
| -rw-r--r-- | drivers/infiniband/hw/qedr/main.c | 1 | ||||
| -rw-r--r-- | drivers/iommu/fsl_pamu.h | 1 | ||||
| -rw-r--r-- | drivers/iommu/rockchip-iommu.c | 1 | ||||
| -rw-r--r-- | drivers/iommu/tegra-smmu.c | 1 | ||||
| -rw-r--r-- | include/linux/dma-iommu.h | 1 | ||||
| -rw-r--r-- | include/trace/events/iommu.h | 1 |
7 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index 81cdb2e..982f85b 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -28,6 +28,7 @@ #include <linux/dma-contiguous.h> #include <linux/vmalloc.h> #include <linux/swiotlb.h> +#include <linux/pci.h> #include <asm/cacheflush.h> diff --git a/drivers/infiniband/hw/qedr/main.c b/drivers/infiniband/hw/qedr/main.c index b9b47e5..3303362 100644 --- a/drivers/infiniband/hw/qedr/main.c +++ b/drivers/infiniband/hw/qedr/main.c @@ -35,6 +35,7 @@ #include <rdma/ib_user_verbs.h> #include <linux/netdevice.h> #include <linux/iommu.h> +#include <linux/pci.h> #include <net/addrconf.h> #include <linux/qed/qede_roce.h> #include <linux/qed/qed_chain.h> diff --git a/drivers/iommu/fsl_pamu.h b/drivers/iommu/fsl_pamu.h index aab723f..c3434f2 100644 --- a/drivers/iommu/fsl_pamu.h +++ b/drivers/iommu/fsl_pamu.h @@ -20,6 +20,7 @@ #define __FSL_PAMU_H #include <linux/iommu.h> +#include <linux/pci.h> #include <asm/fsl_pamu_stash.h> diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c index 9afcbf7..0ba303a 100644 --- a/drivers/iommu/rockchip-iommu.c +++ b/drivers/iommu/rockchip-iommu.c @@ -8,6 +8,7 @@ #include <linux/delay.h> #include <linux/device.h> #include <linux/dma-iommu.h> +#include <linux/dma-mapping.h> #include <linux/errno.h> #include <linux/interrupt.h> #include <linux/io.h> diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c index 9305964..eeb19f5 100644 --- a/drivers/iommu/tegra-smmu.c +++ b/drivers/iommu/tegra-smmu.c @@ -15,6 +15,7 @@ #include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/slab.h> +#include <linux/dma-mapping.h> #include <soc/tegra/ahb.h> #include <soc/tegra/mc.h> diff --git a/include/linux/dma-iommu.h b/include/linux/dma-iommu.h index 5725c94..abd9465 100644 --- a/include/linux/dma-iommu.h +++ b/include/linux/dma-iommu.h @@ -20,6 +20,7 @@ #include <asm/errno.h> #ifdef CONFIG_IOMMU_DMA +#include <linux/dma-mapping.h> #include <linux/iommu.h> #include <linux/msi.h> diff --git a/include/trace/events/iommu.h b/include/trace/events/iommu.h index 2c7befb..99254ed 100644 --- a/include/trace/events/iommu.h +++ b/include/trace/events/iommu.h @@ -11,7 +11,6 @@ #define _TRACE_IOMMU_H #include <linux/tracepoint.h> -#include <linux/pci.h> struct device; |
