[Xen-devel] [PATCH] x86: don't include {amd-, }iommu.h from fixmap.h

[Jan Beulich <JBeulich@xxxxxxxx>]

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@xxxxxxxx>

--- 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>
--- 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>
--- 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>
  
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel