diff options
Diffstat (limited to 'mm/nobootmem.c')
-rw-r--r-- | mm/nobootmem.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mm/nobootmem.c b/mm/nobootmem.c index 2c254d374655..19121ceb8874 100644 --- a/mm/nobootmem.c +++ b/mm/nobootmem.c | |||
@@ -41,7 +41,7 @@ static void * __init __alloc_memory_core_early(int nid, u64 size, u64 align, | |||
41 | if (limit > memblock.current_limit) | 41 | if (limit > memblock.current_limit) |
42 | limit = memblock.current_limit; | 42 | limit = memblock.current_limit; |
43 | 43 | ||
44 | addr = memblock_find_in_range_node(goal, limit, size, align, nid); | 44 | addr = memblock_find_in_range_node(size, align, goal, limit, nid); |
45 | if (!addr) | 45 | if (!addr) |
46 | return NULL; | 46 | return NULL; |
47 | 47 | ||
@@ -117,7 +117,7 @@ static unsigned long __init free_low_memory_core_early(void) | |||
117 | phys_addr_t start, end, size; | 117 | phys_addr_t start, end, size; |
118 | u64 i; | 118 | u64 i; |
119 | 119 | ||
120 | for_each_free_mem_range(i, MAX_NUMNODES, &start, &end, NULL) | 120 | for_each_free_mem_range(i, NUMA_NO_NODE, &start, &end, NULL) |
121 | count += __free_memory_core(start, end); | 121 | count += __free_memory_core(start, end); |
122 | 122 | ||
123 | /* free range that is used for reserved array if we allocate it */ | 123 | /* free range that is used for reserved array if we allocate it */ |
@@ -161,7 +161,7 @@ unsigned long __init free_all_bootmem(void) | |||
161 | reset_all_zones_managed_pages(); | 161 | reset_all_zones_managed_pages(); |
162 | 162 | ||
163 | /* | 163 | /* |
164 | * We need to use MAX_NUMNODES instead of NODE_DATA(0)->node_id | 164 | * We need to use NUMA_NO_NODE instead of NODE_DATA(0)->node_id |
165 | * because in some case like Node0 doesn't have RAM installed | 165 | * because in some case like Node0 doesn't have RAM installed |
166 | * low ram will be on Node1 | 166 | * low ram will be on Node1 |
167 | */ | 167 | */ |
@@ -215,7 +215,7 @@ static void * __init ___alloc_bootmem_nopanic(unsigned long size, | |||
215 | 215 | ||
216 | restart: | 216 | restart: |
217 | 217 | ||
218 | ptr = __alloc_memory_core_early(MAX_NUMNODES, size, align, goal, limit); | 218 | ptr = __alloc_memory_core_early(NUMA_NO_NODE, size, align, goal, limit); |
219 | 219 | ||
220 | if (ptr) | 220 | if (ptr) |
221 | return ptr; | 221 | return ptr; |
@@ -299,7 +299,7 @@ again: | |||
299 | if (ptr) | 299 | if (ptr) |
300 | return ptr; | 300 | return ptr; |
301 | 301 | ||
302 | ptr = __alloc_memory_core_early(MAX_NUMNODES, size, align, | 302 | ptr = __alloc_memory_core_early(NUMA_NO_NODE, size, align, |
303 | goal, limit); | 303 | goal, limit); |
304 | if (ptr) | 304 | if (ptr) |
305 | return ptr; | 305 | return ptr; |