aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Banks <gnb@melbourne.sgi.com>2006-10-02 05:17:41 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-02 10:57:17 -0400
commita406c3664e171ca8f20dfb339074b26eb2674ac0 (patch)
treebe0333419c9c966f7190726132fb8957b51641bc
parente16b38f71322efd8a221f64b6ddc0748d21d2e1a (diff)
[PATCH] cpumask: export node_to_cpu_mask consistently
cpumask: ensure that node_to_cpumask() is available to modules for all supported combinations of architecture and CONFIG_NUMA. Signed-off-by: Greg Banks <gnb@melbourne.sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/i386/kernel/smpboot.c1
-rw-r--r--arch/ia64/kernel/numa.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c
index 0831f709f77..9d93ecf6d99 100644
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
@@ -612,6 +612,7 @@ extern struct {
612/* which logical CPUs are on which nodes */ 612/* which logical CPUs are on which nodes */
613cpumask_t node_2_cpu_mask[MAX_NUMNODES] __read_mostly = 613cpumask_t node_2_cpu_mask[MAX_NUMNODES] __read_mostly =
614 { [0 ... MAX_NUMNODES-1] = CPU_MASK_NONE }; 614 { [0 ... MAX_NUMNODES-1] = CPU_MASK_NONE };
615EXPORT_SYMBOL(node_2_cpu_mask);
615/* which node each logical CPU is on */ 616/* which node each logical CPU is on */
616int cpu_2_node[NR_CPUS] __read_mostly = { [0 ... NR_CPUS-1] = 0 }; 617int cpu_2_node[NR_CPUS] __read_mostly = { [0 ... NR_CPUS-1] = 0 };
617EXPORT_SYMBOL(cpu_2_node); 618EXPORT_SYMBOL(cpu_2_node);
diff --git a/arch/ia64/kernel/numa.c b/arch/ia64/kernel/numa.c
index 20340631179..a78b45f5fe2 100644
--- a/arch/ia64/kernel/numa.c
+++ b/arch/ia64/kernel/numa.c
@@ -28,6 +28,7 @@ u16 cpu_to_node_map[NR_CPUS] __cacheline_aligned;
28EXPORT_SYMBOL(cpu_to_node_map); 28EXPORT_SYMBOL(cpu_to_node_map);
29 29
30cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned; 30cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned;
31EXPORT_SYMBOL(node_to_cpu_mask);
31 32
32void __cpuinit map_cpu_to_node(int cpu, int nid) 33void __cpuinit map_cpu_to_node(int cpu, int nid)
33{ 34{