Re: cpumask change causes sparc build bustage

[Mike Travis]

David Miller wrote:
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Date: Sun, 11 Jan 2009 20:50:08 +1100
> 
>> On Sun, 11 Jan 2009 00:31:03 -0800 (PST) David Miller <davem@xxxxxxxxxxxxx> wrote:
>>> I'm surprised linux-next builds didn't catch this.
>> So am I.  http://kisskb.ellerman.id.au/kisskb/compiler/5/ shows my latest
>> builds of both linux-next and Linus' tree are OK for defconfig and
>> allnoconfig (allmodconfig fails for a different reason).
>>
>> What is different about the failing config (compiler)?  Are there other
>> configs it would be sensible to build test?
> 
> Maybe you don't have NUMA enabled in the test build configs.
> I hit it during an allmodconfig.
> 
> Anyways this fixes it, someone please apply:
> 
> sparc64: Fix cpumask related build failure.
> 
> Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
> 
> diff --git a/arch/sparc/include/asm/topology_64.h b/arch/sparc/include/asm/topology_64.h
> index b8a65b6..5bc0b8f 100644
> --- a/arch/sparc/include/asm/topology_64.h
> +++ b/arch/sparc/include/asm/topology_64.h
> @@ -47,6 +47,10 @@ static inline int pcibus_to_node(struct pci_bus *pbus)
>  	(pcibus_to_node(bus) == -1 ? \
>  	 CPU_MASK_ALL : \
>  	 node_to_cpumask(pcibus_to_node(bus)))
> +#define cpumask_of_pcibus(bus)	\
> +	(pcibus_to_node(bus) == -1 ? \
> +	 CPU_MASK_ALL_PTR : \
> +	 cpumask_of_node(pcibus_to_node(bus)))
>  
>  #define SD_NODE_INIT (struct sched_domain) {		\
>  	.min_interval		= 8,			\

Ouch.  Sorry you had to find this.  I thought Rusty had pushed all the arch
changes required for cpumask_of_pcibus() quite some time ago.

Thanks for fixing it.  In actuality though, it should return cpu_mask_all
instead of CPU_MASK_ALL_PTR but that's a small nit.

Thanks,
Mike
--
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/