aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/mm
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2011-05-02 11:24:49 -0400
committerTejun Heo <tj@kernel.org>2011-05-02 11:24:49 -0400
commita56bca80db8903bb557b9ac38da68dc5b98ea672 (patch)
tree4068115c0ba694138065dc7d2c3ec92aba70b750 /arch/x86/mm
parent1b7e03ef7570568d2fb9e6640d7006a0edd728f6 (diff)
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: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'arch/x86/mm')
-rw-r--r--arch/x86/mm/numa.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index ecb5685d7d2..9a0ed312b83 100644
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@ -189,8 +189,8 @@ int __init numa_add_memblk(int nid, u64 start, u64 end)
189 return numa_add_memblk_to(nid, start, end, &numa_meminfo); 189 return numa_add_memblk_to(nid, start, end, &numa_meminfo);
190} 190}
191 191
192/* Initialize bootmem allocator for a node */ 192/* Initialize NODE_DATA for a node on the local memory */
193static void __init setup_node_bootmem(int nid, u64 start, u64 end) 193static void __init setup_node_data(int nid, u64 start, u64 end)
194{ 194{
195 const u64 nd_low = PFN_PHYS(MAX_DMA_PFN); 195 const u64 nd_low = PFN_PHYS(MAX_DMA_PFN);
196 const u64 nd_high = PFN_PHYS(max_pfn_mapped); 196 const u64 nd_high = PFN_PHYS(max_pfn_mapped);
@@ -522,7 +522,7 @@ static int __init numa_register_memblks(struct numa_meminfo *mi)
522 } 522 }
523 523
524 if (start < end) 524 if (start < end)
525 setup_node_bootmem(nid, start, end); 525 setup_node_data(nid, start, end);
526 } 526 }
527 527
528 return 0; 528 return 0;