linux-kernel - [PATCH] iommu: dmar: make include of x86

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:   Fri, 20 Oct 2017 13:35:48 +0200
From:   Arnd Bergmann <arnd@...db.de>
To:     Thomas Gleixner <tglx@...utronix.de>,
        Ingo Molnar <mingo@...nel.org>, x86@...nel.org
Cc:     y2038@...ts.linaro.org, Arnd Bergmann <arnd@...db.de>,
        Joerg Roedel <joro@...tes.org>,
        Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
        iommu@...ts.linux-foundation.org, linux-kernel@...r.kernel.org
Subject: [PATCH] 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")
Signed-off-by: Arnd Bergmann <arnd@...db.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