From patchwork Fri Oct 20 11:35:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 116483 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp1582776qgn; Fri, 20 Oct 2017 04:36:30 -0700 (PDT) X-Google-Smtp-Source: ABhQp+ReUlNIjMA1d6sDvAKkB5iDbWyzM0n3aBeuW0WJT6tR8l/KqspSjDCsV/O3jAOzYWVK2mPm X-Received: by 10.98.217.78 with SMTP id s75mr4800164pfg.40.1508499390419; Fri, 20 Oct 2017 04:36:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508499390; cv=none; d=google.com; s=arc-20160816; b=ZI7XYJ5X/pE/rd+Fzolk5JX/deIPoQKd3uTVOtp8ve1PqIIuGiMAhun8p7ACtME12n GEZUIs7eSubLbj5fNMQp5YFf8di7WS03jVgG4fI0s+OtMWIYPPce8+FyeRkGf6TroxCX TducPCjPhQY2NJ1QGWe1oyDEKhzQvZnHHzTMiM3LraW9OhIB+E/7KprOQQcuP2bkBVmT OhFld9d6U1xNcwMlpHpejRI+/jFa8fTCF2WRB/zUgTQ7aB5q6RJB6r6I0+klvzuBOq+Y Hz4b02EiA5Rw6srtAU7EujYbVniQYLdxg9PArg5X/3DAzqRcmFB1bo5I0HSCOSXG+/10 /JXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=zffVhytdrr5siJ2f70DFMIEsC6z5g1PTC7SHTFvUkmc=; b=Go7wr7lh8xbfX0AkTNtKKIQyxRMuEzWa5BlINKItQq9SG503XUFdEcqFSEKUooLa0h qdkO7aUInKYSylzGJlT9exvUHVNkMGgWGDIpmlQxJAnLMPEgSUeVlr2UQVKGAtPqQcUw 0LpsCw6VgVS9yuJmTVSrQ+t1raTUxsqaDVdcSZW9Lsb46N/gAqbegKM2Q1s9RZHMPnAU ZufOgZ/sOuVhyykojvF4bTOLi13z3SwIAhtvLCwkfkUshwj8Kypkp/Xj1aa/ga0uQYgV qHJZ28J9ysrHOvDE76U/ljaw3PiNPYqG9ULP148JNOa3Q6kX3pRXofdOVPGgy54YAV9Y dTmg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k184si622789pga.340.2017.10.20.04.36.30; Fri, 20 Oct 2017 04:36:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753095AbdJTLg2 (ORCPT + 27 others); 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 Received: from wuerfel.lan ([46.223.139.202]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.145]) with ESMTPA (Nemesis) id 0LjrTN-1dTgjl0YKf-00bsU6; Fri, 20 Oct 2017 13:36:12 +0200 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 Precedence: bulk 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(+) -- 2.9.0 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"