Re: [PATCH] irq: remove wrong ifdef

[Rusty Russell]

On Saturday 28 March 2009 15:15:34 Yinghai Lu wrote:
> Impact: fix smp_affinity copying
> 
> CPUMASKS_OFFSTACK is not defined anywhere.
> and init_allocate_desc_masks called before it set affinity to all cpus...
> 
> just remove those #idef to make them get copied
> 
> Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx>
> 
> ---
>  include/linux/irq.h |    4 ----
>  1 file changed, 4 deletions(-)
> 
> Index: linux-2.6/include/linux/irq.h
> ===================================================================
> --- linux-2.6.orig/include/linux/irq.h
> +++ linux-2.6/include/linux/irq.h
> @@ -468,20 +468,16 @@ static inline bool init_alloc_desc_masks
>   * @new_desc:	pointer to new irq_desc struct
>   *
>   * Insures affinity and pending_masks are copied to new irq_desc.
> - * If !CONFIG_CPUMASKS_OFFSTACK the cpumasks are embedded in the
> - * irq_desc struct so the copy is redundant.
>   */
>  
>  static inline void init_copy_desc_masks(struct irq_desc *old_desc,
>  					struct irq_desc *new_desc)
>  {
> -#ifdef CONFIG_CPUMASKS_OFFSTACK
>  	cpumask_copy(new_desc->affinity, old_desc->affinity);
>  
>  #ifdef CONFIG_GENERIC_PENDING_IRQ
>  	cpumask_copy(new_desc->pending_mask, old_desc->pending_mask);
>  #endif
> -#endif
>  }
>  
>  #else /* !CONFIG_SMP */

Wow, that is supposed to be CONFIG_CPUMASK_OFFSTACK.

The reason it is there is that we already do the memcpy of old_desc: this
extra copy is only needed if the cpumasks are external.  But perhaps it's
an over-optimization.

Thanks,
Rusty.
--
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/