From: Jan Beulich <jbeulich@suse.com>
Date: Tue, 30 Jul 2019 10:00:05 +0000 (+0200)
Subject: x86: don't include {amd-,}iommu.h from fixmap.h
X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~1829
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=850454cf9fa417e079c48a872ead17636a5be44f;p=xen.git

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 89b70f45ef..eadf7a4dab 100644
--- 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 3a2e403173..23a4e822e7 100644
--- 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 16ccaa2c77..9fb2f47946 100644
--- 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>