summaryrefslogtreecommitdiffstats
path: root/mm/page_alloc.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r--mm/page_alloc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 59d171f84445..8ca6954fdcdc 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -6209,7 +6209,7 @@ static void __ref setup_usemap(struct pglist_data *pgdat,
6209 zone->pageblock_flags = NULL; 6209 zone->pageblock_flags = NULL;
6210 if (usemapsize) 6210 if (usemapsize)
6211 zone->pageblock_flags = 6211 zone->pageblock_flags =
6212 memblock_virt_alloc_node_nopanic(usemapsize, 6212 memblock_alloc_node_nopanic(usemapsize,
6213 pgdat->node_id); 6213 pgdat->node_id);
6214} 6214}
6215#else 6215#else
@@ -6439,7 +6439,7 @@ static void __ref alloc_node_mem_map(struct pglist_data *pgdat)
6439 end = pgdat_end_pfn(pgdat); 6439 end = pgdat_end_pfn(pgdat);
6440 end = ALIGN(end, MAX_ORDER_NR_PAGES); 6440 end = ALIGN(end, MAX_ORDER_NR_PAGES);
6441 size = (end - start) * sizeof(struct page); 6441 size = (end - start) * sizeof(struct page);
6442 map = memblock_virt_alloc_node_nopanic(size, pgdat->node_id); 6442 map = memblock_alloc_node_nopanic(size, pgdat->node_id);
6443 pgdat->node_mem_map = map + offset; 6443 pgdat->node_mem_map = map + offset;
6444 } 6444 }
6445 pr_debug("%s: node %d, pgdat %08lx, node_mem_map %08lx\n", 6445 pr_debug("%s: node %d, pgdat %08lx, node_mem_map %08lx\n",
@@ -7711,9 +7711,9 @@ void *__init alloc_large_system_hash(const char *tablename,
7711 size = bucketsize << log2qty; 7711 size = bucketsize << log2qty;
7712 if (flags & HASH_EARLY) { 7712 if (flags & HASH_EARLY) {
7713 if (flags & HASH_ZERO) 7713 if (flags & HASH_ZERO)
7714 table = memblock_virt_alloc_nopanic(size, 0); 7714 table = memblock_alloc_nopanic(size, 0);
7715 else 7715 else
7716 table = memblock_virt_alloc_raw(size, 0); 7716 table = memblock_alloc_raw(size, 0);
7717 } else if (hashdist) { 7717 } else if (hashdist) {
7718 table = __vmalloc(size, gfp_flags, PAGE_KERNEL); 7718 table = __vmalloc(size, gfp_flags, PAGE_KERNEL);
7719 } else { 7719 } else {