5 files changed, 54 insertions, 12 deletions

diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c
index f948419c888a..efe07990e7fc 100644
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
@@ -642,9 +642,13 @@ static void map_cpu_to_logical_apicid(void)
 {
         int cpu = smp_processor_id();
         int apicid = logical_smp_processor_id();
+        int node = apicid_to_node(apicid);
+
+        if (!node_online(node))
+                node = first_online_node;
 
         cpu_2_logical_apicid[cpu] = apicid;
-        map_cpu_to_node(cpu, apicid_to_node(apicid));
+        map_cpu_to_node(cpu, node);
 }
 
 static void unmap_cpu_to_logical_apicid(int cpu)
diff --git a/arch/i386/mm/boot_ioremap.c b/arch/i386/mm/boot_ioremap.c
index 5d44f4f5ff59..4de11f508c3a 100644
--- a/arch/i386/mm/boot_ioremap.c
+++ b/arch/i386/mm/boot_ioremap.c
@@ -29,8 +29,11 @@
  */
 
 #define BOOT_PTE_PTRS (PTRS_PER_PTE*2)
-#define boot_pte_index(address) \
-             (((address) >> PAGE_SHIFT) & (BOOT_PTE_PTRS - 1))
+
+static unsigned long boot_pte_index(unsigned long vaddr) 
+{
+        return __pa(vaddr) >> PAGE_SHIFT;
+}
 
 static inline boot_pte_t* boot_vaddr_to_pte(void *address)
 {
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 0176556aeecc..32c3abededc6 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -771,16 +771,19 @@ int acpi_map_cpu2node(acpi_handle handle, int cpu, long physid)
 {
 #ifdef CONFIG_ACPI_NUMA
         int pxm_id;
+        int nid;
 
         pxm_id = acpi_get_pxm(handle);
-
         /*
-         * Assuming that the container driver would have set the proximity
-         * domain and would have initialized pxm_to_node(pxm_id) && pxm_flag
+         * We don't have cpu-only-node hotadd. But if the system equips
+         * SRAT table, pxm is already found and node is ready.
+         * So, just pxm_to_nid(pxm) is OK.
+         * This code here is for the system which doesn't have full SRAT
+         * table for possible cpus.
          */
-        node_cpuid[cpu].nid = (pxm_id < 0) ? 0 : pxm_to_node(pxm_id);
-
+        nid = acpi_map_pxm_to_node(pxm_id);
         node_cpuid[cpu].phys_id = physid;
+        node_cpuid[cpu].nid = nid;
 #endif
         return (0);
 }
diff --git a/arch/ia64/kernel/numa.c b/arch/ia64/kernel/numa.c
index 1cc360c83e7a..20340631179f 100644
--- a/arch/ia64/kernel/numa.c
+++ b/arch/ia64/kernel/numa.c
@@ -29,6 +29,36 @@ 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
  *
@@ -49,8 +79,6 @@ void __init build_cpu_to_node_map(void)
                                 node = node_cpuid[i].nid;
                                 break;
                         }
-                cpu_to_node_map[cpu] = (node >= 0) ? node : 0;
-                if (node >= 0)
-                        cpu_set(cpu, node_to_cpu_mask[node]);
+                map_cpu_to_node(cpu, node);
         }
 }
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c
index f648c610b10c..05bdf7affb43 100644
--- a/arch/ia64/kernel/topology.c
+++ b/arch/ia64/kernel/topology.c
@@ -36,6 +36,9 @@ int arch_register_cpu(int num)
          */
         if (!can_cpei_retarget() && is_cpu_cpei_target(num))
                 sysfs_cpus[num].cpu.no_control = 1;
+#ifdef CONFIG_NUMA
+        map_cpu_to_node(num, node_cpuid[num].nid);
+#endif
 #endif
 
         return register_cpu(&sysfs_cpus[num].cpu, num);
@@ -45,7 +48,8 @@ int arch_register_cpu(int num)
 
 void arch_unregister_cpu(int num)
 {
-        return unregister_cpu(&sysfs_cpus[num].cpu);
+        unregister_cpu(&sysfs_cpus[num].cpu);
+        unmap_cpu_from_node(num, cpu_to_node(num));
 }
 EXPORT_SYMBOL(arch_register_cpu);
 EXPORT_SYMBOL(arch_unregister_cpu);