aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuslan Bukin <br@FreeBSD.org>2020-07-21 13:50:10 +0000
committerRuslan Bukin <br@FreeBSD.org>2020-07-21 13:50:10 +0000
commit1238a28d152e19b4d0ad0ad98a464e83278c494f (patch)
tree2adb1c73d4edd006568386e278c59c7db0549848
parentf2b2f31707bce25e3fdee9fdfcb75ddbd1ff3338 (diff)
downloadsrc-1238a28d152e19b4d0ad0ad98a464e83278c494f.tar.gz
src-1238a28d152e19b4d0ad0ad98a464e83278c494f.zip
Move sys/iommu.h to dev/iommu/ as a part of generic IOMMU busdma backend.
Reviewed by: kib Sponsored by: DARPA/AFRL Differential Revision: https://reviews.freebsd.org/D25750
Notes
Notes: svn path=/head/; revision=363388
-rw-r--r--sys/dev/iommu/busdma_iommu.c2
-rw-r--r--sys/dev/iommu/busdma_iommu.h2
-rw-r--r--sys/dev/iommu/iommu.h (renamed from sys/sys/iommu.h)0
-rw-r--r--sys/x86/iommu/intel_dmar.h2
4 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/iommu/busdma_iommu.c b/sys/dev/iommu/busdma_iommu.c
index 02da3acf5e9e..d543436a8a86 100644
--- a/sys/dev/iommu/busdma_iommu.c
+++ b/sys/dev/iommu/busdma_iommu.c
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
#include <sys/bus.h>
#include <sys/conf.h>
#include <sys/interrupt.h>
-#include <sys/iommu.h>
#include <sys/kernel.h>
#include <sys/ktr.h>
#include <sys/lock.h>
@@ -68,6 +67,7 @@ __FBSDID("$FreeBSD$");
#include <x86/include/busdma_impl.h>
#include <x86/iommu/intel_reg.h>
#include <dev/iommu/busdma_iommu.h>
+#include <dev/iommu/iommu.h>
#include <x86/iommu/intel_dmar.h>
#endif
diff --git a/sys/dev/iommu/busdma_iommu.h b/sys/dev/iommu/busdma_iommu.h
index 22575a6cb35a..77ac9d0a6e2d 100644
--- a/sys/dev/iommu/busdma_iommu.h
+++ b/sys/dev/iommu/busdma_iommu.h
@@ -34,7 +34,7 @@
#ifndef __X86_IOMMU_BUSDMA_DMAR_H
#define __X86_IOMMU_BUSDMA_DMAR_H
-#include <sys/iommu.h>
+#include <dev/iommu/iommu.h>
struct bus_dma_tag_iommu {
struct bus_dma_tag_common common;
diff --git a/sys/sys/iommu.h b/sys/dev/iommu/iommu.h
index 8d039c2dee09..8d039c2dee09 100644
--- a/sys/sys/iommu.h
+++ b/sys/dev/iommu/iommu.h
diff --git a/sys/x86/iommu/intel_dmar.h b/sys/x86/iommu/intel_dmar.h
index cd9639c00b64..e6212255b382 100644
--- a/sys/x86/iommu/intel_dmar.h
+++ b/sys/x86/iommu/intel_dmar.h
@@ -34,7 +34,7 @@
#ifndef __X86_IOMMU_INTEL_DMAR_H
#define __X86_IOMMU_INTEL_DMAR_H
-#include <sys/iommu.h>
+#include <dev/iommu/iommu.h>
struct dmar_unit;