From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753093AbdJTLg2 (ORCPT ); Fri, 20 Oct 2017 07:36:28 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:57293 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752668AbdJTLg1 (ORCPT ); Fri, 20 Oct 2017 07:36:27 -0400 From: Arnd Bergmann To: Thomas Gleixner , Ingo Molnar , x86@kernel.org Cc: y2038@lists.linaro.org, Arnd Bergmann , Joerg Roedel , Andy Shevchenko , iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: [PATCH] iommu: dmar: make include of x86_init.h conditional Date: Fri, 20 Oct 2017 13:35:48 +0200 Message-Id: <20171020113604.2974648-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:VAwRxavCwKhHMNRdFiZU6K2uiNKdhM8+hT9xUOj5H0AbcdZOmhW ylvgiWtVxf+XhTN9q38WamRDFmNRa3H2OX5iLKq61pzWEFsMcyIWyM+uQmZTQQ0MUk4s6gn LOnNbhT7rLfe5ZmNY3wExMAE8/o7r52kFSvGpHRhSJBwNG7FSogTIdggduTQwLDZc21WGH4 DBTda2FBRcmc48JM/OrYA== X-UI-Out-Filterresults: notjunk:1;V01:K0:bd+eG0cgnJ0=:ahUk+Z3gGAs2T4so6BuGjK gABGCgbkoFrz451EUPjQVPml1eSTOZ64OaKny10LOKYjX4kD6atgtPGrokjbiLor77GCdS9XT YWdPT7HDRUWkij+xCX3Ze4V9BoFdpapSnUkYlMPTPuZ+w7vp5RX3B70/Pfo/6hC/QHMd4K5rE ywA0YUZryGLcipwOu0rFyBbGf2ypAS5u5FTORUjtEker4xhrg4o7I1U/13FUlBUmleBsB4Typ ZX2ITYB87KA1KSJn3pMX3cG4CmqpoMdB/t9/bDaXloCRrs3oD6CvjKgNpWky7ehGjlnP5u8Uq 49S5eu1vvI+jSHP5xqiIKsXq97/R09eXNvco5YVwSGPNcsm9VeyXqKgXp/GSr1KJLoa+dObL9 qChAw82uEs6SGfh/4tpr0V6XE7qROSC8kZexYw8K/XkMzkC7uInjeAt6LMOuBW+mJLhAgorqv rJZviKOMqdVCrGaLT2K69yIU9oQVbD36F+KTMYSte38Z/7Uz4/5ke0sBR2WMptJ1VV7wHX5or C4UxMgpBiOIWAOuBXtCaWbNKSuJR2V5NXX4Ita0cWTB2ImjUhxBT92tf3ivA8w+cX2CUs51AF zx3BAXAGylRCFeHKZMxRuJzX+o+LSCF1JuWWoLFSp2lgeCfTPIdEIKEqttrnstEF6Aio/FCUm LDLl9yYYA/XZLjN4JHXb8ScIPr7zPCiMBLQiEM6DxTHabjg+C8zEKvYDWkiy2NpDjKhfk6qdT /JWEQISw31gCtAipilNa99sSi4JKVIA8TqBcgA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 #include #include +#ifdef CONFIG_X86 #include +#endif #include "irq_remapping.h" -- 2.9.0