x86: Add missing include to amd_iommu.h

Reported by header-check script: We need this in the header due to the
use of struct jailhouse_memory. Consequently, we can remove the include
from the corresponding amd_iommu.c.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

diff --git a/hypervisor/arch/x86/amd_iommu.c b/hypervisor/arch/x86/amd_iommu.c
index fb2f952fd7a1d7759dcf5f7f50bec48b7e675e73..b3b8087eecbff30f7a8798d938a55bfe38b91c43 100644 (file)
--- a/hypervisor/arch/x86/amd_iommu.c
+++ b/hypervisor/arch/x86/amd_iommu.c
@@ -17,7 +17,6 @@
  */
 
 #include <jailhouse/cell.h>
-#include <jailhouse/cell-config.h>
 #include <jailhouse/control.h>
 #include <jailhouse/mmio.h>
 #include <jailhouse/pci.h>

diff --git a/hypervisor/arch/x86/include/asm/amd_iommu.h b/hypervisor/arch/x86/include/asm/amd_iommu.h
index dc069b2697eb9df669ae05cb06841939e3c500e8..92bd85289a9bcb58e2192aa12d7729b30e41a16c 100644 (file)
--- a/hypervisor/arch/x86/include/asm/amd_iommu.h
+++ b/hypervisor/arch/x86/include/asm/amd_iommu.h
@@ -18,6 +18,8 @@
 #include <jailhouse/types.h>
 #include <jailhouse/utils.h>
 
+#include <jailhouse/cell-config.h>
+
 #define AMD_IOMMU_PTE_P                        (1ULL <<  0)
 #define AMD_IOMMU_PTE_PG_MODE(level)   ((level) << 9)
 #define AMD_IOMMU_PTE_PG_MODE_MASK     BIT_MASK(11, 9)