Re: [Xen-devel] [RFC v1 8/8] x86/init: use linker table for mid early setup

[Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>]

On Tue, Dec 15, 2015 at 02:16:37PM -0800, Luis R. Rodriguez wrote:
> From: "Luis R. Rodriguez" <mcgrof@xxxxxxxx>
> 
> Using the linker table removes the need for the #ifdef'ery
> and clutter on head32.c.

Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
> 
> Signed-off-by: Luis R. Rodriguez <mcgrof@xxxxxxxx>
> ---
>  arch/x86/include/asm/setup.h            | 6 ------
>  arch/x86/kernel/head32.c                | 7 -------
>  arch/x86/platform/intel-mid/intel-mid.c | 4 +++-
>  3 files changed, 3 insertions(+), 14 deletions(-)
> 
> diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h
> index f1e111a9d558..1345c1de7f99 100644
> --- a/arch/x86/include/asm/setup.h
> +++ b/arch/x86/include/asm/setup.h
> @@ -45,12 +45,6 @@ extern void reserve_standard_io_resources(void);
>  extern void i386_reserve_resources(void);
>  extern void setup_default_timer_irq(void);
>  
> -#ifdef CONFIG_X86_INTEL_MID
> -extern void x86_intel_mid_early_setup(void);
> -#else
> -static inline void x86_intel_mid_early_setup(void) { }
> -#endif
> -
>  #ifndef _SETUP
>  
>  #include <asm/espfix.h>
> diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c
> index ec6912873395..b23d16a2a5d5 100644
> --- a/arch/x86/kernel/head32.c
> +++ b/arch/x86/kernel/head32.c
> @@ -36,13 +36,6 @@ asmlinkage __visible void __init i386_start_kernel(void)
>       cr4_init_shadow();
>       sanitize_boot_params(&boot_params);
>  
> -     /* Call the subarch specific early setup function */
> -     switch (boot_params.hdr.hardware_subarch) {
> -     case X86_SUBARCH_INTEL_MID:
> -             x86_intel_mid_early_setup();
> -             break;
> -     }
> -
>       x86_init_fn_init_tables();
>       x86_init_fn_early_init();
>  
> diff --git a/arch/x86/platform/intel-mid/intel-mid.c 
> b/arch/x86/platform/intel-mid/intel-mid.c
> index 1bbc21e2e4ae..27bc33193a06 100644
> --- a/arch/x86/platform/intel-mid/intel-mid.c
> +++ b/arch/x86/platform/intel-mid/intel-mid.c
> @@ -167,7 +167,7 @@ static unsigned char intel_mid_get_nmi_reason(void)
>   * Moorestown specific x86_init function overrides and early setup
>   * calls.
>   */
> -void __init x86_intel_mid_early_setup(void)
> +static void __init x86_intel_mid_early_setup(void)
>  {
>       x86_init.resources.probe_roms = x86_init_noop;
>       x86_init.resources.reserve_resources = x86_init_noop;
> @@ -199,6 +199,8 @@ void __init x86_intel_mid_early_setup(void)
>       x86_init.mpparse.get_smp_config = x86_init_uint_noop;
>       set_bit(MP_BUS_ISA, mp_bus_not_pci);
>  }
> +x86_init_early(BIT(X86_SUBARCH_INTEL_MID), NULL, NULL,
> +            x86_intel_mid_early_setup);
>  
>  /*
>   * if user does not want to use per CPU apb timer, just give it a lower 
> rating
> -- 
> 2.6.2
> 

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel