Re: tip: IA64 build error

[Mike Travis <travis@sgi.com>]

Ingo Molnar wrote:
> * FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> wrote:
> 
>> I got the followings with tip/master:
>>
>> drivers/pci/probe.c: In function 'pci_bus_show_cpuaffinity':
>> drivers/pci/probe.c:56: error: implicit declaration of function 'cpumask_from_node'
>> drivers/pci/probe.c:56: warning: pointer/integer type mismatch in conditional expression
>> make[3]: *** [drivers/pci/probe.o] Error 1
>> make[2]: *** [drivers/pci] Error 2
>>
>>
>> it's due to the typo in arch/ia64/include/asm/topology.h, I guess.
> 
> yeah. Does the patch below fix it for you?
> 
> 	Ingo
> 
> ---------------->
>>From 36c401a44abcc389a00f9cd14892c9cf9bf0780d Mon Sep 17 00:00:00 2001
> From: Ingo Molnar <mingo@elte.hu>
> Date: Tue, 6 Jan 2009 16:19:22 +0100
> Subject: [PATCH] [IA64] fix typo in cpumask_of_pcibus()
> 
> Impact: build fix
> 
> Fujita Tomonori reported:
> 
>  drivers/pci/probe.c: In function 'pci_bus_show_cpuaffinity':
>  drivers/pci/probe.c:56: error: implicit declaration of function 'cpumask_from_node'
>  drivers/pci/probe.c:56: warning: pointer/integer type mismatch in conditional expression
>  make[3]: *** [drivers/pci/probe.o] Error 1
>  make[2]: *** [drivers/pci] Error 2
> 
> FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
> Signed-off-by: Ingo Molnar <mingo@elte.hu>
> ---
>  arch/ia64/include/asm/topology.h |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/ia64/include/asm/topology.h b/arch/ia64/include/asm/topology.h
> index 76a33a9..32f3af1 100644
> --- a/arch/ia64/include/asm/topology.h
> +++ b/arch/ia64/include/asm/topology.h
> @@ -124,7 +124,7 @@ extern void arch_fix_phys_package_id(int num, u32 slot);
>  
>  #define cpumask_of_pcibus(bus)	(pcibus_to_node(bus) == -1 ?		\
>  				 cpu_all_mask :				\
> -				 cpumask_from_node(pcibus_to_node(bus)))
> +				 cpumask_of_node(pcibus_to_node(bus)))
>  
>  #include <asm-generic/topology.h>
>  

Did I do that?  I could have sworn I test-built on ia64.  But here's the commit,
and I merged it.

Sorry about that.

Mike

--commit fbb776c3ca4501d5a2821bf1e9bceefcaec7ae47
Author: Rusty Russell <rusty@rustcorp.com.au>
Date:   Fri Dec 26 22:23:40 2008 +1030

    cpumask: IA64: Introduce cpumask_of_{node,pcibus} to replace {node,pcibus}_to_cpumask

...
+#define cpumask_of_pcibus(bus) (pcibus_to_node(bus) == -1 ?            \
+                                cpu_all_mask :                         \
+                                cpumask_from_node(pcibus_to_node(bus)))
+