Re: [tip:x86/timers] x86: Don't include asm/x86_init.h in asm/setup.h

[Ingo Molnar]

* tip-bot for Arnd Bergmann <tipbot@xxxxxxxxx> wrote:

> Commit-ID:  0f5a0f4f062cc19090a87f9eb8cb79c7c2e4db19
> Gitweb:     https://git.kernel.org/tip/0f5a0f4f062cc19090a87f9eb8cb79c7c2e4db19
> Author:     Arnd Bergmann <arnd@xxxxxxxx>
> AuthorDate: Thu, 19 Oct 2017 12:53:02 +0200
> Committer:  Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> 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 <arnd@xxxxxxxx>
> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> Cc: y2038@xxxxxxxxxxxxxxxx
> Cc: Joerg Roedel <joro@xxxxxxxxxx>
> Cc: iommu@xxxxxxxxxxxxxxxxxxxxxxxxxx
> Link: https://lkml.kernel.org/r/20171019105451.2892046-1-arnd@xxxxxxxx
> 
> ---
>  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 <asm/bootparam.h>
> -#include <asm/x86_init.h>
>  
>  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 <asm/setup.h>
>  #include <asm/bios_ebda.h>
> +#include <asm/x86_init.h>
>  
>  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 <asm/io.h>
>  #include <asm/io_apic.h>
>  #include <asm/emergency-restart.h>
> +#include <asm/x86_init.h>
>  
>  /*
>   * 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 <asm/intel_scu_ipc.h>
>  #include <asm/apb_timer.h>
>  #include <asm/reboot.h>
> +#include <asm/x86_init.h>
>  
>  #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 <asm/setup.h>
>  #include <asm/olpc.h>
>  #include <asm/olpc_ofw.h>
> +#include <asm/x86_init.h>
>  
>  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 <linux/iommu.h>
>  #include <asm/irq_remapping.h>
>  #include <asm/iommu_table.h>
> +#include <asm/x86_init.h>
>  
>  #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