Re: [PATCH 2/2] cpumask fallout: Initialize irq_default_affinityearlier (v2).

[Mike Travis]

It's essentially the same as I tested on x86_64 so you can add my

	Acked-by: Mike Travis <travis@xxxxxxx>

Thanks!
Mike

David Daney wrote:
> Move the initialization of irq_default_affinity to early_irq_init as
> core_initcall is too late.
> 
> irq_default_affinity can be used in init_IRQ and potentially timer and
> SMP init as well.  All of these happen before core_initcall.  Moving
> the initialization to early_irq_init ensures that it is initialized
> before it is used.
> 
> Signed-off-by: David Daney <ddaney@xxxxxxxxxxxxxxxxxx>
> ---
>  kernel/irq/handle.c |   12 ++++++++++++
>  kernel/irq/manage.c |    8 --------
>  2 files changed, 12 insertions(+), 8 deletions(-)
> 
> diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
> index c20db0b..a9fbb01 100644
> --- a/kernel/irq/handle.c
> +++ b/kernel/irq/handle.c
> @@ -39,6 +39,14 @@ void handle_bad_irq(unsigned int irq, struct irq_desc *desc)
>  	ack_bad_irq(irq);
>  }
>  
> +static inline void __init init_irq_default_affinity(void)
> +{
> +#if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_HARDIRQS)
> +	alloc_bootmem_cpumask_var(&irq_default_affinity);
> +	cpumask_setall(irq_default_affinity);
> +#endif
> +}
> +
>  /*
>   * Linux has a controller-independent interrupt architecture.
>   * Every controller has a 'controller-template', that is used
> @@ -134,6 +142,8 @@ int __init early_irq_init(void)
>  	int legacy_count;
>  	int i;
>  
> +	init_irq_default_affinity();
> +
>  	desc = irq_desc_legacy;
>  	legacy_count = ARRAY_SIZE(irq_desc_legacy);
>  
> @@ -219,6 +229,8 @@ int __init early_irq_init(void)
>  	int count;
>  	int i;
>  
> +	init_irq_default_affinity();
> +
>  	desc = irq_desc;
>  	count = ARRAY_SIZE(irq_desc);
>  
> diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
> index 618a64f..291f036 100644
> --- a/kernel/irq/manage.c
> +++ b/kernel/irq/manage.c
> @@ -18,14 +18,6 @@
>  #if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_HARDIRQS)
>  cpumask_var_t irq_default_affinity;
>  
> -static int init_irq_default_affinity(void)
> -{
> -	alloc_cpumask_var(&irq_default_affinity, GFP_KERNEL);
> -	cpumask_setall(irq_default_affinity);
> -	return 0;
> -}
> -core_initcall(init_irq_default_affinity);
> -
>  /**
>   *	synchronize_irq - wait for pending IRQ handlers (on other CPUs)
>   *	@irq: interrupt number to wait for

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/