x86-32, mm: Remove reference to alloc_remap() (07f4207a) · Commits · 戴 / test

arch/x86/mm/numa.c

+11 −18

Original line number	Diff line number	Diff line
		@@ -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,14 +210,9 @@ 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",
		@@ -226,13 +220,12 @@ static void __init setup_node_data(int nid, u64 start, u64 end)
		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;