From 1238a28d152e19b4d0ad0ad98a464e83278c494f Mon Sep 17 00:00:00 2001
From: Ruslan Bukin <br@FreeBSD.org>
Date: Tue, 21 Jul 2020 13:50:10 +0000
Subject: [PATCH] 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
---
 sys/dev/iommu/busdma_iommu.c   | 2 +-
 sys/dev/iommu/busdma_iommu.h   | 2 +-
 sys/{sys => dev/iommu}/iommu.h | 0
 sys/x86/iommu/intel_dmar.h     | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename sys/{sys => dev/iommu}/iommu.h (100%)

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
similarity index 100%
rename from sys/sys/iommu.h
rename to 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;