Prev: linux-next: build failure after merge of the block tree
Next: [GIT PULL] Procfs bkl removal for 2.6.35
From: Randy Dunlap on 17 May 2010 23:50
On Mon, 17 May 2010 21:46:50 -0400 Lee Schermerhorn wrote:

> On Sun, 2010-05-16 at 16:37 -0700, Randy Dunlap wrote:
> > include/linux/topology.h:248: error: implicit declaration of function 'cpu_to_node'
> >
> >
> > config attached.
>
> Hmmm, i386 NUMA.
>
> With the following patch, your config builds correctly. !NUMA i386
> still builds, as well.

Yes, thanks.

Acked-by: Randy Dunlap <rdunlap(a)xenotime.net>


> Lee
>
> Fix i386 numa build: define cpu_to_node() stub same as
> early_cpu_to_node() for i386 numa builds. Just return node
> from cpu_to_node_map[].
>
> Signed-off-by: Lee Schermerhorn <lee.schermerhorn(a)hp.com>
>
> arch/x86/include/asm/topology.h | 4 +++-
> 1 files changed, 3 insertions(+), 1 deletion(-)
>
> Index: linux-2.6.34-rc7-mmotm-100514-1333/arch/x86/include/asm/topology.h
> ===================================================================
> --- linux-2.6.34-rc7-mmotm-100514-1333.orig/arch/x86/include/asm/topology.h 2010-05-17 08:40:47.000000000 -0400
> +++ linux-2.6.34-rc7-mmotm-100514-1333/arch/x86/include/asm/topology.h 2010-05-17 10:49:08.000000000 -0400
> @@ -53,10 +53,12 @@
> extern int cpu_to_node_map[];
>
> /* Returns the number of the node containing CPU 'cpu' */
> -static inline int early_cpu_to_node(int cpu)
> +static inline int __cpu_to_node(int cpu)
> {
> return cpu_to_node_map[cpu];
> }
> +#define early_cpu_to_node __cpu_to_node
> +#define cpu_to_node __cpu_to_node
>
> #else /* CONFIG_X86_64 */
>
>
>


---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: linux-next: build failure after merge of the block tree
Next: [GIT PULL] Procfs bkl removal for 2.6.35