Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 365414
b: refs/heads/master
c: 055e4fd
h: refs/heads/master
v: v3
  • Loading branch information
Ben Hutchings authored and Linus Torvalds committed Apr 29, 2013
1 parent 727d5f2 commit f1e5ffa
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 949f7ec5760b021da3cccc1eaeb0671270e4238f
refs/heads/master: 055e4fd96e95b0eee0d92fd54a26be7f0d3bcad0
8 changes: 5 additions & 3 deletions trunk/mm/sparse-vmemmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit f1e5ffa

Please sign in to comment.