Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 959982fe authored by Yinghai Lu's avatar Yinghai Lu Committed by Pekka Enberg
Browse files

memcg: don't use bootmem allocator in setup code 



The bootmem allocator is no longer available for page_cgroup_init() because we
set up the kernel slab allocator much earlier now.

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
parent dad213ae

mm/page_cgroup.c

+8 −4
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ static int __init alloc_node_page_cgroup(int nid) 
	struct page_cgroup *base, *pc;

	unsigned long table_size;

	unsigned long start_pfn, nr_pages, index;

	struct page *page;

	unsigned int order;



	start_pfn = NODE_DATA(nid)->node_start_pfn;

	nr_pages = NODE_DATA(nid)->node_spanned_pages;
@@ -55,11 +57,13 @@ static int __init alloc_node_page_cgroup(int nid) 
		return 0;



	table_size = sizeof(struct page_cgroup) * nr_pages;



	base = __alloc_bootmem_node_nopanic(NODE_DATA(nid),

			table_size, PAGE_SIZE, __pa(MAX_DMA_ADDRESS));

	if (!base)

	order = get_order(table_size);

	page = alloc_pages_node(nid, GFP_NOWAIT | __GFP_ZERO, order);

	if (!page)

		page = alloc_pages_node(-1, GFP_NOWAIT | __GFP_ZERO, order);

	if (!page)

		return -ENOMEM;

	base = page_address(page);

	for (index = 0; index < nr_pages; index++) {

		pc = base + index;

		__init_page_cgroup(pc, start_pfn + index);