From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752862AbdJTLL1 (ORCPT ); Fri, 20 Oct 2017 07:11:27 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:44367 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752774AbdJTLLZ (ORCPT ); Fri, 20 Oct 2017 07:11:25 -0400 X-Google-Smtp-Source: ABhQp+R5gv3PJW1e2QQxlzfMoUrRmXIoG5Zx8vBfYUenQyJAPTXxh/YdgLhGR2gxxtPIZUs8SZtQGQ== Date: Fri, 20 Oct 2017 13:11:20 +0200 From: Ingo Molnar To: arnd@arndb.de, linux-kernel@vger.kernel.org, tglx@linutronix.de, joro@8bytes.org, hpa@zytor.com Cc: linux-tip-commits@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [tip:x86/timers] x86: Don't include asm/x86_init.h in asm/setup.h Message-ID: <20171020111120.gl3x6hhnkbexdx6i@gmail.com> References: <20171019105451.2892046-1-arnd@arndb.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: NeoMutt/20170113 (1.7.2) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * tip-bot for Arnd Bergmann wrote: > Commit-ID: 0f5a0f4f062cc19090a87f9eb8cb79c7c2e4db19 > Gitweb: https://git.kernel.org/tip/0f5a0f4f062cc19090a87f9eb8cb79c7c2e4db19 > Author: Arnd Bergmann > AuthorDate: Thu, 19 Oct 2017 12:53:02 +0200 > Committer: Thomas Gleixner > CommitDate: Thu, 19 Oct 2017 15:41:18 +0200 > > x86: Don't include asm/x86_init.h in asm/setup.h > > This is a preparation to allow using 'struct timespec64' in asm/x86_init.h. > > Unfortunately, using a forward declaration for timespec64 is not possible > since it is defined as a macro on 64-bit architectures, and including > linux/time64.h breaks compilation of arch/x86/boot/, which runs in realmode > and can't use many of the regular kernel headers. > > As a workaround, stop including asm/x86_init.h. This works fine for the > realmode boot code since it does not require any of the x86_init.h > contents, and setup.h doesn't either. > > However, a couple of other files need x86_init.h and rely on it being > included indirectly, so add an explicit include in there now. > > [ tglx: Massaged changelog to 'imperative mood' ] > > Signed-off-by: Arnd Bergmann > Signed-off-by: Thomas Gleixner > Cc: y2038@lists.linaro.org > Cc: Joerg Roedel > Cc: iommu@lists.linux-foundation.org > Link: https://lkml.kernel.org/r/20171019105451.2892046-1-arnd@arndb.de > > --- > arch/x86/include/asm/setup.h | 1 - > arch/x86/kernel/platform-quirks.c | 1 + > arch/x86/platform/ce4100/ce4100.c | 1 + > arch/x86/platform/intel-mid/intel-mid.c | 1 + > arch/x86/platform/olpc/olpc.c | 1 + > drivers/iommu/dmar.c | 1 + > 6 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h > index a65cf54..deed841 100644 > --- a/arch/x86/include/asm/setup.h > +++ b/arch/x86/include/asm/setup.h > @@ -27,7 +27,6 @@ > > #ifndef __ASSEMBLY__ > #include > -#include > > extern u64 relocated_ramdisk; > > diff --git a/arch/x86/kernel/platform-quirks.c b/arch/x86/kernel/platform-quirks.c > index 502a77d..d900c7b 100644 > --- a/arch/x86/kernel/platform-quirks.c > +++ b/arch/x86/kernel/platform-quirks.c > @@ -3,6 +3,7 @@ > > #include > #include > +#include > > void __init x86_early_init_platform_quirks(void) > { > diff --git a/arch/x86/platform/ce4100/ce4100.c b/arch/x86/platform/ce4100/ce4100.c > index ce4b067..8851963 100644 > --- a/arch/x86/platform/ce4100/ce4100.c > +++ b/arch/x86/platform/ce4100/ce4100.c > @@ -22,6 +22,7 @@ > #include > #include > #include > +#include > > /* > * The CE4100 platform has an internal 8051 Microcontroller which is > diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c > index 86676ce..c632226 100644 > --- a/arch/x86/platform/intel-mid/intel-mid.c > +++ b/arch/x86/platform/intel-mid/intel-mid.c > @@ -35,6 +35,7 @@ > #include > #include > #include > +#include > > #include "intel_mid_weak_decls.h" > > diff --git a/arch/x86/platform/olpc/olpc.c b/arch/x86/platform/olpc/olpc.c > index 7c3077e..11a54f3 100644 > --- a/arch/x86/platform/olpc/olpc.c > +++ b/arch/x86/platform/olpc/olpc.c > @@ -26,6 +26,7 @@ > #include > #include > #include > +#include > > struct olpc_platform_t olpc_platform_info; > EXPORT_SYMBOL_GPL(olpc_platform_info); > diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c > index 57c920c..ca507c5 100644 > --- a/drivers/iommu/dmar.c > +++ b/drivers/iommu/dmar.c > @@ -41,6 +41,7 @@ > #include > #include > #include > +#include > > #include "irq_remapping.h" This breaks the IA64 build: drivers/iommu/dmar.c:44:26: fatal error: asm/x86_init.h: No such file or directory Thanks, Ingo