x86-32, mm: Remove reference to alloc_remap()

We have removed the remap allocator for x86-32, and x86-64 never had
it (and doesn't need it).  Remove residual reference to it.

Reported-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Cc: Dave Hansen <dave@linux.vnet.ibm.com>
Cc: <stable@vger.kernel.org>
Link: http://lkml.kernel.org/r/CAE9FiQVn6_QZi3fNQ-JHYiR-7jeDJ5hT0SyT_%2BzVvfOj=PzF3w@mail.gmail.com

diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index 61c2b6f5ff88e7bab133f96c14cb7badd9475904..8504f3698753d499c1e0425f8e7d149e79836c02 100644 (file)
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@ -193,7 +193,6 @@ int __init numa_add_memblk(int nid, u64 start, u64 end)
 static void __init setup_node_data(int nid, u64 start, u64 end)
 {
        const size_t nd_size = roundup(sizeof(pg_data_t), PAGE_SIZE);
-       bool remapped = false;
        u64 nd_pa;
        void *nd;
        int tnid;
@@ -211,28 +210,22 @@ static void __init setup_node_data(int nid, u64 start, u64 end)
               nid, start, end - 1);
 
        /*
-        * Allocate node data.  Try remap allocator first, node-local
-        * memory and then any node.  Never allocate in DMA zone.
+        * Allocate node data.  Try node-local memory and then any node.
+        * Never allocate in DMA zone.
         */
-       nd = alloc_remap(nid, nd_size);
-       if (nd) {
-               nd_pa = __pa_nodebug(nd);
-               remapped = true;
-       } else {
-               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;
-               }
-               nd = __va(nd_pa);
+       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;
        }
+       nd = __va(nd_pa);
 
        /* report and initialize */
-       printk(KERN_INFO "  NODE_DATA [mem %#010Lx-%#010Lx]%s\n",
-              nd_pa, nd_pa + nd_size - 1, remapped ? " (remapped)" : "");
+       printk(KERN_INFO "  NODE_DATA [mem %#010Lx-%#010Lx]\n",
+              nd_pa, nd_pa + nd_size - 1);
        tnid = early_pfn_to_nid(nd_pa >> PAGE_SHIFT);
-       if (!remapped && tnid != nid)
+       if (tnid != nid)
                printk(KERN_INFO "    NODE_DATA(%d) on node %d\n", nid, tnid);
 
        node_data[nid] = nd;