Skip to contentSkip to conversation

iommu: dmar: make include of x86_init.h conditional

PATCH New Arnd Bergmann 1 participant 1 message Oct 20, 2017 IOMMU

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iommu: dmar: make include of x86_init.h conditional

The dmar driver can be used on both x86 and itanium, but only the former uses the x86_init structure. The only reference to that structure is enclosed in an #ifdef, but the header inclusion I added is not.

Adds another #ifdef to get ia64 to build again.

Fixes 0f5a0f4f062c ("x86: don't include asm/x86_init.h in asm/setup.h")

---
The broken commit is in x86/timers, please add this one on top

---
 drivers/iommu/dmar.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/iommu/dmar.c +2 -0
index e9304d6247e1..ed1dd13e03ac 100644
@@ -41,7 +41,9 @@
 #include <linux/iommu.h>
 #include <asm/irq_remapping.h>
 #include <asm/iommu_table.h>
+#ifdef CONFIG_X86
 #include <asm/x86_init.h>
+#endif
 
 #include "irq_remapping.h"
 
Signature · 6 lines
2.9.0

_______________________________________________
Y2038 mailing list
[email protected]
https://lists.linaro.org/mailman/listinfo/y2038