diff options
author | 2009-03-31 13:33:50 +1030 | |
---|---|---|
committer | 2009-03-31 13:33:50 +1030 | |
commit | 558f6ab9106e6be701acb0257e7171df1bbccf04 (patch) | |
tree | 6e811633baeb676693c493f6c82bf785cab2771d /arch/sparc | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
parent | Merge branch 'linus' into cpumask-for-linus (diff) | |
download | linux-558f6ab9106e6be701acb0257e7171df1bbccf04.tar.gz linux-558f6ab9106e6be701acb0257e7171df1bbccf04.tar.bz2 linux-558f6ab9106e6be701acb0257e7171df1bbccf04.zip |
Merge branch 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
Conflicts:
arch/x86/include/asm/topology.h
drivers/oprofile/buffer_sync.c
(Both cases: changed in Linus' tree, removed in Ingo's).
Diffstat (limited to 'arch/sparc')
-rw-r--r-- | arch/sparc/include/asm/mmzone.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/mmzone.h b/arch/sparc/include/asm/mmzone.h index ebf5986c12ed..e8c648741ed4 100644 --- a/arch/sparc/include/asm/mmzone.h +++ b/arch/sparc/include/asm/mmzone.h @@ -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]) |