From 586c836e1920c86c3fbac12b0f9e0ca32e8d01a8 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Thu, 28 May 2009 18:15:16 -0700 Subject: [PATCH] --- yaml --- r: 147121 b: refs/heads/master c: 959982fee4e635c61780e989c3e34267143fcc02 h: refs/heads/master i: 147119: 7c290f6b11f6abd3a06e89d2b1880e7b584f0a78 v: v3 --- [refs] | 2 +- trunk/mm/page_cgroup.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f07cc134acff..550782dc0c69 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dad213aeb59718623fc59defeff95fe8c3feb8a0 +refs/heads/master: 959982fee4e635c61780e989c3e34267143fcc02 diff --git a/trunk/mm/page_cgroup.c b/trunk/mm/page_cgroup.c index 791905c991df..3dd4a909a1de 100644 --- a/trunk/mm/page_cgroup.c +++ b/trunk/mm/page_cgroup.c @@ -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);