* [PATCH] iommu: dmar: make include of x86_init.h conditional
@ 2017-10-20 11:35 Arnd Bergmann
0 siblings, 0 replies; only message in thread
From: Arnd Bergmann @ 2017-10-20 11:35 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, x86
Cc: Arnd Bergmann, y2038, Joerg Roedel, linux-kernel, iommu,
Andy Shevchenko
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(+)
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"
--
2.9.0
_______________________________________________
Y2038 mailing list
Y2038@lists.linaro.org
https://lists.linaro.org/mailman/listinfo/y2038
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2017-10-20 11:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-20 11:35 [PATCH] iommu: dmar: make include of x86_init.h conditional Arnd Bergmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox