x86: don't include {amd-,}iommu.h from fixmap.h

The #include was added by 0700c962ac ("Add AMD IOMMU support into
hypervisor") and I then didn't drop it again in d7f913b8de ("AMD IOMMU:
use ioremap()"); similarly for xen/iommu.h in 99321e0e6c ("VT-d: use
ioremap()"). Avoid needlessly re-building unrelated files when only
IOMMU definitions have changed.

Two #include-s of xen/init.h turn out necessary as replacement.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>

diff --git a/xen/drivers/acpi/apei/apei-io.c b/xen/drivers/acpi/apei/apei-io.c
index 89b70f45ef47df3ba076f42b37da116ad050951c..eadf7a4dab53d7be15c6d4183c1beec0491bfb14 100644 (file)
--- a/xen/drivers/acpi/apei/apei-io.c
+++ b/xen/drivers/acpi/apei/apei-io.c
@@ -21,6 +21,7 @@
 #include <xen/kernel.h>
 #include <xen/errno.h>
 #include <xen/delay.h>
+#include <xen/init.h>
 #include <xen/string.h>
 #include <xen/xmalloc.h>
 #include <xen/types.h>

diff --git a/xen/drivers/acpi/apei/erst.c b/xen/drivers/acpi/apei/erst.c
index 3a2e403173bd5f80ef52fd5393785b48c8fab703..23a4e822e7e63f88349e75df0f2c768fbc1f6a30 100644 (file)
--- a/xen/drivers/acpi/apei/erst.c
+++ b/xen/drivers/acpi/apei/erst.c
@@ -28,6 +28,7 @@
 #include <xen/kernel.h>
 #include <xen/errno.h>
 #include <xen/delay.h>
+#include <xen/init.h>
 #include <xen/string.h>
 #include <xen/types.h>
 #include <xen/spinlock.h>

diff --git a/xen/include/asm-x86/fixmap.h b/xen/include/asm-x86/fixmap.h
index 16ccaa2c771f7aaa86922249b9e3eb86b187cc84..9fb2f479468474714aa27f5f41a8366a83910e41 100644 (file)
--- a/xen/include/asm-x86/fixmap.h
+++ b/xen/include/asm-x86/fixmap.h
@@ -21,9 +21,7 @@
 #include <xen/acpi.h>
 #include <xen/pfn.h>
 #include <xen/kexec.h>
-#include <xen/iommu.h>
 #include <asm/apicdef.h>
-#include <asm/amd-iommu.h>
 #include <asm/msi.h>
 #include <acpi/apei.h>