x86: Fix common misspellings

[pandora-kernel.git] / arch / x86 / mm / numa_64.c

diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c
index cccc01d..e8c00cc 100644 (file)
--- a/arch/x86/mm/numa_64.c
+++ b/arch/x86/mm/numa_64.c
@@ -390,15 +390,14 @@ static void __init numa_nodemask_from_meminfo(nodemask_t *nodemask,
  */
 void __init numa_reset_distance(void)
 {
-       size_t size;
+       size_t size = numa_distance_cnt * numa_distance_cnt * sizeof(numa_distance[0]);
 
-       if (numa_distance_cnt) {
-               size = numa_distance_cnt * sizeof(numa_distance[0]);
+       /* numa_distance could be 1LU marking allocation failure, test cnt */
+       if (numa_distance_cnt)
                memblock_x86_free_range(__pa(numa_distance),
                                        __pa(numa_distance) + size);
-               numa_distance_cnt = 0;
-       }
-       numa_distance = NULL;
+       numa_distance_cnt = 0;
+       numa_distance = NULL;   /* enable table creation */
 }
 
 static int __init numa_alloc_distance(void)
@@ -414,7 +413,8 @@ static int __init numa_alloc_distance(void)
 
        for_each_node_mask(i, nodes_parsed)
                cnt = i;
-       size = ++cnt * sizeof(numa_distance[0]);
+       cnt++;
+       size = cnt * cnt * sizeof(numa_distance[0]);
 
        phys = memblock_find_in_range(0, (u64)max_pfn_mapped << PAGE_SHIFT,
                                      size, PAGE_SIZE);
@@ -446,8 +446,16 @@ static int __init numa_alloc_distance(void)
  * @distance: NUMA distance
  *
  * Set the distance from node @from to @to to @distance.  If distance table
- * doesn't exist, one which is large enough to accomodate all the currently
+ * doesn't exist, one which is large enough to accommodate all the currently
  * known nodes will be created.
+ *
+ * If such table cannot be allocated, a warning is printed and further
+ * calls are ignored until the distance table is reset with
+ * numa_reset_distance().
+ *
+ * If @from or @to is higher than the highest known node at the time of
+ * table creation or @distance doesn't make sense, the call is ignored.
+ * This is to allow simplification of specific NUMA config implementations.
  */
 void __init numa_set_distance(int from, int to, int distance)
 {
@@ -535,8 +543,6 @@ static int __init numa_register_memblks(struct numa_meminfo *mi)
        if (!numa_meminfo_cover_memory(mi))
                return -EINVAL;
 
-       init_memory_mapping_high();
-
        /* Finally register nodes. */
        for_each_node_mask(nid, node_possible_map) {
                u64 start = (u64)max_pfn << PAGE_SHIFT;
@@ -556,6 +562,15 @@ static int __init numa_register_memblks(struct numa_meminfo *mi)
        return 0;
 }
 
+/**
+ * dummy_numma_init - Fallback dummy NUMA init
+ *
+ * Used if there's no underlying NUMA architecture, NUMA initialization
+ * fails, or NUMA is disabled on the command line.
+ *
+ * Must online at least one node and add memory blocks that cover all
+ * allowed memory.  This function must not fail.
+ */
 static int __init dummy_numa_init(void)
 {
        printk(KERN_INFO "%s\n",
@@ -569,57 +584,64 @@ static int __init dummy_numa_init(void)
        return 0;
 }
 
-void __init initmem_init(void)
+static int __init numa_init(int (*init_func)(void))
 {
-       int (*numa_init[])(void) = { [2] = dummy_numa_init };
-       int i, j;
+       int i;
+       int ret;
 
-       if (!numa_off) {
-#ifdef CONFIG_ACPI_NUMA
-               numa_init[0] = x86_acpi_numa_init;
-#endif
-#ifdef CONFIG_AMD_NUMA
-               numa_init[1] = amd_numa_init;
-#endif
-       }
+       for (i = 0; i < MAX_LOCAL_APIC; i++)
+               set_apicid_to_node(i, NUMA_NO_NODE);
 
-       for (i = 0; i < ARRAY_SIZE(numa_init); i++) {
-               if (!numa_init[i])
-                       continue;
+       nodes_clear(numa_nodes_parsed);
+       nodes_clear(node_possible_map);
+       nodes_clear(node_online_map);
+       memset(&numa_meminfo, 0, sizeof(numa_meminfo));
+       remove_all_active_ranges();
+       numa_reset_distance();
 
-               for (j = 0; j < MAX_LOCAL_APIC; j++)
-                       set_apicid_to_node(j, NUMA_NO_NODE);
+       ret = init_func();
+       if (ret < 0)
+               return ret;
+       ret = numa_cleanup_meminfo(&numa_meminfo);
+       if (ret < 0)
+               return ret;
 
-               nodes_clear(numa_nodes_parsed);
-               nodes_clear(node_possible_map);
-               nodes_clear(node_online_map);
-               memset(&numa_meminfo, 0, sizeof(numa_meminfo));
-               remove_all_active_ranges();
-               numa_reset_distance();
+       numa_emulation(&numa_meminfo, numa_distance_cnt);
 
-               if (numa_init[i]() < 0)
-                       continue;
-
-               if (numa_cleanup_meminfo(&numa_meminfo) < 0)
-                       continue;
+       ret = numa_register_memblks(&numa_meminfo);
+       if (ret < 0)
+               return ret;
 
-               numa_emulation(&numa_meminfo, numa_distance_cnt);
+       for (i = 0; i < nr_cpu_ids; i++) {
+               int nid = early_cpu_to_node(i);
 
-               if (numa_register_memblks(&numa_meminfo) < 0)
+               if (nid == NUMA_NO_NODE)
                        continue;
+               if (!node_online(nid))
+                       numa_clear_node(i);
+       }
+       numa_init_array();
+       return 0;
+}
 
-               for (j = 0; j < nr_cpu_ids; j++) {
-                       int nid = early_cpu_to_node(j);
+void __init initmem_init(void)
+{
+       int ret;
 
-                       if (nid == NUMA_NO_NODE)
-                               continue;
-                       if (!node_online(nid))
-                               numa_clear_node(j);
-               }
-               numa_init_array();
-               return;
+       if (!numa_off) {
+#ifdef CONFIG_ACPI_NUMA
+               ret = numa_init(x86_acpi_numa_init);
+               if (!ret)
+                       return;
+#endif
+#ifdef CONFIG_AMD_NUMA
+               ret = numa_init(amd_numa_init);
+               if (!ret)
+                       return;
+#endif
        }
-       BUG();
+
+       numa_init(dummy_numa_init);
 }
 
 unsigned long __init numa_free_all_bootmem(void)