diff options
Diffstat (limited to 'arch/x86/mm/discontig_32.c')
-rw-r--r-- | arch/x86/mm/discontig_32.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/mm/discontig_32.c b/arch/x86/mm/discontig_32.c index eba0bbede7a6..18378850e25a 100644 --- a/arch/x86/mm/discontig_32.c +++ b/arch/x86/mm/discontig_32.c | |||
@@ -120,7 +120,7 @@ int __init get_memcfg_numa_flat(void) | |||
120 | printk("NUMA - single node, flat memory mode\n"); | 120 | printk("NUMA - single node, flat memory mode\n"); |
121 | 121 | ||
122 | /* Run the memory configuration and find the top of memory. */ | 122 | /* Run the memory configuration and find the top of memory. */ |
123 | find_max_pfn(); | 123 | propagate_e820_map(); |
124 | node_start_pfn[0] = 0; | 124 | node_start_pfn[0] = 0; |
125 | node_end_pfn[0] = max_pfn; | 125 | node_end_pfn[0] = max_pfn; |
126 | memory_present(0, 0, max_pfn); | 126 | memory_present(0, 0, max_pfn); |
@@ -134,7 +134,7 @@ int __init get_memcfg_numa_flat(void) | |||
134 | /* | 134 | /* |
135 | * Find the highest page frame number we have available for the node | 135 | * Find the highest page frame number we have available for the node |
136 | */ | 136 | */ |
137 | static void __init find_max_pfn_node(int nid) | 137 | static void __init propagate_e820_map_node(int nid) |
138 | { | 138 | { |
139 | if (node_end_pfn[nid] > max_pfn) | 139 | if (node_end_pfn[nid] > max_pfn) |
140 | node_end_pfn[nid] = max_pfn; | 140 | node_end_pfn[nid] = max_pfn; |
@@ -379,7 +379,7 @@ unsigned long __init setup_memory(void) | |||
379 | printk("High memory starts at vaddr %08lx\n", | 379 | printk("High memory starts at vaddr %08lx\n", |
380 | (ulong) pfn_to_kaddr(highstart_pfn)); | 380 | (ulong) pfn_to_kaddr(highstart_pfn)); |
381 | for_each_online_node(nid) | 381 | for_each_online_node(nid) |
382 | find_max_pfn_node(nid); | 382 | propagate_e820_map_node(nid); |
383 | 383 | ||
384 | memset(NODE_DATA(0), 0, sizeof(struct pglist_data)); | 384 | memset(NODE_DATA(0), 0, sizeof(struct pglist_data)); |
385 | NODE_DATA(0)->bdata = &node0_bdata; | 385 | NODE_DATA(0)->bdata = &node0_bdata; |