Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/arch/ia64/mm/numa.c b/arch/ia64/mm/numa.c
index ef2dbcf..4e5c8b3 100644 (file)
--- a/arch/ia64/mm/numa.c
+++ b/arch/ia64/mm/numa.c
@@ -20,8 +20,6 @@
 #include <asm/mmzone.h>
 #include <asm/numa.h>
 
-static struct node *sysfs_nodes;
-static struct cpu *sysfs_cpus;
 
 /*
  * The following structures are usually initialized by ACPI or
@@ -50,36 +48,26 @@ paddr_to_nid(unsigned long paddr)
        return (i < num_node_memblks) ? node_memblk[i].nid : (num_node_memblks ? -1 : 0);
 }
 
-static int __init topology_init(void)
+#if defined(CONFIG_SPARSEMEM) && defined(CONFIG_NUMA)
+/*
+ * Because of holes evaluate on section limits.
+ * If the section of memory exists, then return the node where the section
+ * resides.  Otherwise return node 0 as the default.  This is used by
+ * SPARSEMEM to allocate the SPARSEMEM sectionmap on the NUMA node where
+ * the section resides.
+ */
+int early_pfn_to_nid(unsigned long pfn)
 {
-       int i, err = 0;
-
-       sysfs_nodes = kmalloc(sizeof(struct node) * numnodes, GFP_KERNEL);
-       if (!sysfs_nodes) {
-               err = -ENOMEM;
-               goto out;
-       }
-       memset(sysfs_nodes, 0, sizeof(struct node) * numnodes);
+       int i, section = pfn >> PFN_SECTION_SHIFT, ssec, esec;
 
-       sysfs_cpus = kmalloc(sizeof(struct cpu) * NR_CPUS, GFP_KERNEL);
-       if (!sysfs_cpus) {
-               kfree(sysfs_nodes);
-               err = -ENOMEM;
-               goto out;
+       for (i = 0; i < num_node_memblks; i++) {
+               ssec = node_memblk[i].start_paddr >> PA_SECTION_SHIFT;
+               esec = (node_memblk[i].start_paddr + node_memblk[i].size +
+                       ((1L << PA_SECTION_SHIFT) - 1)) >> PA_SECTION_SHIFT;
+               if (section >= ssec && section < esec)
+                       return node_memblk[i].nid;
        }
-       memset(sysfs_cpus, 0, sizeof(struct cpu) * NR_CPUS);
-
-       for (i = 0; i < numnodes; i++)
-               if ((err = register_node(&sysfs_nodes[i], i, 0)))
-                       goto out;
 
-       for (i = 0; i < NR_CPUS; i++)
-               if (cpu_online(i))
-                       if((err = register_cpu(&sysfs_cpus[i], i,
-                                              &sysfs_nodes[cpu_to_node(i)])))
-                               goto out;
- out:
-       return err;
+       return 0;
 }
-
-__initcall(topology_init);
+#endif