numa, cpumask: move numa_node_id default implementation to topology.h, fix
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 19 Mar 2009 11:03:22 +0000 (22:03 +1100)
committerIngo Molnar <mingo@elte.hu>
Thu, 19 Mar 2009 11:51:25 +0000 (12:51 +0100)
Impact: build fix for powerpc and sparc

Today's linux-next build (powerpc allyesconfig) failed like this:

> In file included from include/linux/mmzone.h:776,
>                  from include/linux/gfp.h:5,
>                  from include/linux/kmod.h:23,
>                  from include/linux/module.h:14,
>                  from init/version.c:11:
> arch/powerpc/include/asm/mmzone.h:32: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'numa_cpumask_lookup_table'

Caused by commit 082edb7bf443eb8eda15b482d16ad9dd8137ad24 ("numa,
cpumask: move numa_node_id default implementation to topology.h") from
the cpus4096 tree which removed the include of linux/topology.h from
linux/mmzone.h.

Same for sparc64 defconfig.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-b: Rusty Russell <rusty@rustcorp.com.au>
Cc: ppc-dev <linuxppc-dev@ozlabs.org>
LKML-Reference: <20090319220322.3baa4613.sfr@canb.auug.org.au>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/powerpc/include/asm/mmzone.h
arch/sparc/include/asm/mmzone.h

index 19f299b7e256b93e4d8d1162153cc422ca1ceb72..35acac90c8ca6b3b32500c07cfc2b9586020cf39 100644 (file)
@@ -8,6 +8,7 @@
 #define _ASM_MMZONE_H_
 #ifdef __KERNEL__
 
+#include <linux/cpumask.h>
 
 /*
  * generic non-linear memory support:
index ebf5986c12edd563ffda723e639a3436e03ccaad..e8c648741ed4d12a52949f095257d3aec6176850 100644 (file)
@@ -3,6 +3,8 @@
 
 #ifdef CONFIG_NEED_MULTIPLE_NODES
 
+#include <linux/cpumask.h>
+
 extern struct pglist_data *node_data[];
 
 #define NODE_DATA(nid)         (node_data[nid])