linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / ia64 / kernel / numa.c

diff --git a/arch/ia64/kernel/numa.c b/arch/ia64/kernel/numa.c
index 2034063..a68ce66 100644 (file)
--- a/arch/ia64/kernel/numa.c
+++ b/arch/ia64/kernel/numa.c
@@ -19,46 +19,17 @@
  * Copyright (C) 2004 Silicon Graphics, Inc.
  *   Jesse Barnes <jbarnes@sgi.com>
  */
+#include <linux/config.h>
 #include <linux/topology.h>
 #include <linux/module.h>
 #include <asm/processor.h>
 #include <asm/smp.h>
 
-u16 cpu_to_node_map[NR_CPUS] __cacheline_aligned;
+u8 cpu_to_node_map[NR_CPUS] __cacheline_aligned;
 EXPORT_SYMBOL(cpu_to_node_map);
 
 cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned;
 
-void __cpuinit map_cpu_to_node(int cpu, int nid)
-{
-       int oldnid;
-       if (nid < 0) { /* just initialize by zero */
-               cpu_to_node_map[cpu] = 0;
-               return;
-       }
-       /* sanity check first */
-       oldnid = cpu_to_node_map[cpu];
-       if (cpu_isset(cpu, node_to_cpu_mask[oldnid])) {
-               return; /* nothing to do */
-       }
-       /* we don't have cpu-driven node hot add yet...
-          In usual case, node is created from SRAT at boot time. */
-       if (!node_online(nid))
-               nid = first_online_node;
-       cpu_to_node_map[cpu] = nid;
-       cpu_set(cpu, node_to_cpu_mask[nid]);
-       return;
-}
-
-void __cpuinit unmap_cpu_from_node(int cpu, int nid)
-{
-       WARN_ON(!cpu_isset(cpu, node_to_cpu_mask[nid]));
-       WARN_ON(cpu_to_node_map[cpu] != nid);
-       cpu_to_node_map[cpu] = 0;
-       cpu_clear(cpu, node_to_cpu_mask[nid]);
-}
-
-
 /**
  * build_cpu_to_node_map - setup cpu to node and node to cpumask arrays
  *
@@ -79,6 +50,8 @@ void __init build_cpu_to_node_map(void)
                                node = node_cpuid[i].nid;
                                break;
                        }
-               map_cpu_to_node(cpu, node);
+               cpu_to_node_map[cpu] = (node >= 0) ? node : 0;
+               if (node >= 0)
+                       cpu_set(cpu, node_to_cpu_mask[node]);
        }
 }