diff mbox series

iommu: dmar: make include of x86_init.h conditional

Message ID 20171020113604.2974648-1-arnd@arndb.de
State New
Headers show
Series iommu: dmar: make include of x86_init.h conditional | expand

Commit Message

Arnd Bergmann Oct. 20, 2017, 11:35 a.m. UTC 
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")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
The broken commit is in x86/timers, please add this one on top
---
 drivers/iommu/dmar.c | 2 ++
 1 file changed, 2 insertions(+)

-- 
2.9.0
diff mbox series

Patch

diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c
index e9304d6247e1..ed1dd13e03ac 100644
--- a/drivers/iommu/dmar.c
+++ b/drivers/iommu/dmar.c
@@ -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"