From fe6decf9d3b9a4fd8412f2dbc0d939b965dcc073 Mon Sep 17 00:00:00 2001
From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Sat, 11 Jun 2016 19:00:13 +0200
Subject: [PATCH] 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>
---
 hypervisor/arch/x86/amd_iommu.c             | 1 -
 hypervisor/arch/x86/include/asm/amd_iommu.h | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/hypervisor/arch/x86/amd_iommu.c b/hypervisor/arch/x86/amd_iommu.c
index fb2f952..b3b8087 100644
--- 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 dc069b2..92bd852 100644
--- 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)
-- 
2.39.2