Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a56bca80 authored by Yinghai Lu's avatar Yinghai Lu Committed by Tejun Heo
Browse files

x86, NUMA: Rename setup_node_bootmem() to setup_node_data() 



After using memblock to replace bootmem, that function only sets up
node_data now.

Change the name to reflect what it actually does.

tj: Minor adjustment to the patch description.

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 1b7e03ef

arch/x86/mm/numa.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -189,8 +189,8 @@ int __init numa_add_memblk(int nid, u64 start, u64 end) 
	return numa_add_memblk_to(nid, start, end, &numa_meminfo);

	return numa_add_memblk_to(nid, start, end, &numa_meminfo);

}

}





/* Initialize bootmem allocator for a node */

/* Initialize NODE_DATA for a node on the local memory */

static void __init setup_node_bootmem(int nid, u64 start, u64 end)

static void __init setup_node_data(int nid, u64 start, u64 end)

{

{

	const u64 nd_low = PFN_PHYS(MAX_DMA_PFN);

	const u64 nd_low = PFN_PHYS(MAX_DMA_PFN);

	const u64 nd_high = PFN_PHYS(max_pfn_mapped);

	const u64 nd_high = PFN_PHYS(max_pfn_mapped);
@@ -522,7 +522,7 @@ static int __init numa_register_memblks(struct numa_meminfo *mi) 
		}

		}





		if (start < end)

		if (start < end)

			setup_node_bootmem(nid, start, end);

			setup_node_data(nid, start, end);

	}

	}





	return 0;

	return 0;