From f1e5ffa5b47893883c660159077fa7a36bdcdcda Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 29 Apr 2013 15:07:49 -0700 Subject: [PATCH] --- yaml --- r: 365414 b: refs/heads/master c: 055e4fd96e95b0eee0d92fd54a26be7f0d3bcad0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/sparse-vmemmap.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index beeb14d0bf79..97f402c4eb0a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 949f7ec5760b021da3cccc1eaeb0671270e4238f +refs/heads/master: 055e4fd96e95b0eee0d92fd54a26be7f0d3bcad0 diff --git a/trunk/mm/sparse-vmemmap.c b/trunk/mm/sparse-vmemmap.c index 1b7e22ab9b09..22b7e18e9dea 100644 --- a/trunk/mm/sparse-vmemmap.c +++ b/trunk/mm/sparse-vmemmap.c @@ -53,10 +53,12 @@ void * __meminit vmemmap_alloc_block(unsigned long size, int node) struct page *page; if (node_state(node, N_HIGH_MEMORY)) - page = alloc_pages_node(node, - GFP_KERNEL | __GFP_ZERO, get_order(size)); + page = alloc_pages_node( + node, GFP_KERNEL | __GFP_ZERO | __GFP_REPEAT, + get_order(size)); else - page = alloc_pages(GFP_KERNEL | __GFP_ZERO, + page = alloc_pages( + GFP_KERNEL | __GFP_ZERO | __GFP_REPEAT, get_order(size)); if (page) return page_address(page);