Merge branch 'akpm-current/current'

[karo-tx-linux.git] / mm / page_cgroup.c

diff --git a/mm/page_cgroup.c b/mm/page_cgroup.c
index 3bd0b8e6ab12f43fc3f99efb44c8998a510fd2cb..cfd162882c00a157ce30ada845361593982c1b27 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;
 
-       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;