projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mm/migrate: correct failure handling if !hugepage_migration_support()
[firefly-linux-kernel-4.4.55.git]
/
mm
/
page_cgroup.c
diff --git
a/mm/page_cgroup.c
b/mm/page_cgroup.c
index 6d757e3a872ad52adea55aabecee1ec571c3970d..d8bd2c500aa4a2f53028d1b9bdccaea5c681e466 100644
(file)
--- a/
mm/page_cgroup.c
+++ b/
mm/page_cgroup.c
@@
-54,8
+54,9
@@
static int __init alloc_node_page_cgroup(int nid)
table_size = sizeof(struct page_cgroup) * nr_pages;
table_size = sizeof(struct page_cgroup) * nr_pages;
- base = __alloc_bootmem_node_nopanic(NODE_DATA(nid),
- table_size, PAGE_SIZE, __pa(MAX_DMA_ADDRESS));
+ base = memblock_virt_alloc_try_nid_nopanic(
+ table_size, PAGE_SIZE, __pa(MAX_DMA_ADDRESS),
+ BOOTMEM_ALLOC_ACCESSIBLE, nid);
if (!base)
return -ENOMEM;
NODE_DATA(nid)->node_page_cgroup = base;
if (!base)
return -ENOMEM;
NODE_DATA(nid)->node_page_cgroup = base;