1 files changed, 14 insertions, 23 deletions

diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index fbeaaf41661..496f494593b 100644
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@ -192,8 +192,6 @@ int __init numa_add_memblk(int nid, u64 start, u64 end)
 /* Initialize NODE_DATA for a node on the local memory */
 static void __init setup_node_data(int nid, u64 start, u64 end)
 {
-        const u64 nd_low = PFN_PHYS(MAX_DMA_PFN);
-        const u64 nd_high = PFN_PHYS(max_pfn_mapped);
         const size_t nd_size = roundup(sizeof(pg_data_t), PAGE_SIZE);
         bool remapped = false;
         u64 nd_pa;
@@ -224,17 +222,12 @@ static void __init setup_node_data(int nid, u64 start, u64 end)
                 nd_pa = __pa(nd);
                 remapped = true;
         } else {
-                nd_pa = memblock_x86_find_in_range_node(nid, nd_low, nd_high,
-                                                nd_size, SMP_CACHE_BYTES);
-                if (nd_pa == MEMBLOCK_ERROR)
-                        nd_pa = memblock_find_in_range(nd_low, nd_high,
-                                                nd_size, SMP_CACHE_BYTES);
-                if (nd_pa == MEMBLOCK_ERROR) {
+                nd_pa = memblock_alloc_nid(nd_size, SMP_CACHE_BYTES, nid);
+                if (!nd_pa) {
                         pr_err("Cannot find %zu bytes in node %d\n",
                                nd_size, nid);
                         return;
                 }
-                memblock_x86_reserve_range(nd_pa, nd_pa + nd_size, "NODE_DATA");
                 nd = __va(nd_pa);
         }
 
@@ -371,8 +364,7 @@ void __init numa_reset_distance(void)
 
         /* 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);
+                memblock_free(__pa(numa_distance), size);
         numa_distance_cnt = 0;
         numa_distance = NULL;   /* enable table creation */
 }
@@ -395,13 +387,13 @@ static int __init numa_alloc_distance(void)
 
         phys = memblock_find_in_range(0, PFN_PHYS(max_pfn_mapped),
                                       size, PAGE_SIZE);
-        if (phys == MEMBLOCK_ERROR) {
+        if (!phys) {
                 pr_warning("NUMA: Warning: can't allocate distance table!\n");
                 /* don't retry until explicitly reset */
                 numa_distance = (void *)1LU;
                 return -ENOMEM;
         }
-        memblock_x86_reserve_range(phys, phys + size, "NUMA DIST");
+        memblock_reserve(phys, size);
 
         numa_distance = __va(phys);
         numa_distance_cnt = cnt;
@@ -482,8 +474,8 @@ static bool __init numa_meminfo_cover_memory(const struct numa_meminfo *mi)
                         numaram = 0;
         }
 
-        e820ram = max_pfn - (memblock_x86_hole_size(0,
-                                        PFN_PHYS(max_pfn)) >> PAGE_SHIFT);
+        e820ram = max_pfn - absent_pages_in_range(0, max_pfn);
+
         /* We seem to lose 3 pages somewhere. Allow 1M of slack. */
         if ((s64)(e820ram - numaram) >= (1 << (20 - PAGE_SHIFT))) {
                 printk(KERN_ERR "NUMA: nodes only cover %LuMB of your %LuMB e820 RAM. Not used.\n",
@@ -505,13 +497,10 @@ static int __init numa_register_memblks(struct numa_meminfo *mi)
         if (WARN_ON(nodes_empty(node_possible_map)))
                 return -EINVAL;
 
-        for (i = 0; i < mi->nr_blks; i++)
-                memblock_x86_register_active_regions(mi->blk[i].nid,
-                                        mi->blk[i].start >> PAGE_SHIFT,
-                                        mi->blk[i].end >> PAGE_SHIFT);
-
-        /* for out of order entries */
-        sort_node_map();
+        for (i = 0; i < mi->nr_blks; i++) {
+                struct numa_memblk *mb = &mi->blk[i];
+                memblock_set_node(mb->start, mb->end - mb->start, mb->nid);
+        }
 
         /*
          * If sections array is gonna be used for pfn -> nid mapping, check
@@ -545,6 +534,8 @@ static int __init numa_register_memblks(struct numa_meminfo *mi)
                         setup_node_data(nid, start, end);
         }
 
+        /* Dump memblock with node info and return. */
+        memblock_dump_all();
         return 0;
 }
 
@@ -582,7 +573,7 @@ static int __init numa_init(int (*init_func)(void))
         nodes_clear(node_possible_map);
         nodes_clear(node_online_map);
         memset(&numa_meminfo, 0, sizeof(numa_meminfo));
-        remove_all_active_ranges();
+        WARN_ON(memblock_set_node(0, ULLONG_MAX, MAX_NUMNODES));
         numa_reset_distance();
 
         ret = init_func();