Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 164376
b: refs/heads/master
c: 57dd28f
h: refs/heads/master
v: v3
  • Loading branch information
Lee Schermerhorn authored and Linus Torvalds committed Sep 22, 2009
1 parent a8d14d9 commit 0e4e6cc
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 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: 41a25e7e67b8be33d7598ff7968b9a8b405b6567
refs/heads/master: 57dd28fb0513d2f772bb215f27925165e7b9ce5f
2 changes: 1 addition & 1 deletion trunk/mm/hugetlb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1031,6 +1031,7 @@ int __weak alloc_bootmem_huge_page(struct hstate *h)
NODE_DATA(h->next_nid_to_alloc),
huge_page_size(h), huge_page_size(h), 0);

hstate_next_node_to_alloc(h);
if (addr) {
/*
* Use the beginning of the huge page to store the
Expand All @@ -1040,7 +1041,6 @@ int __weak alloc_bootmem_huge_page(struct hstate *h)
m = addr;
goto found;
}
hstate_next_node_to_alloc(h);
nr_nodes--;
}
return 0;
Expand Down

0 comments on commit 0e4e6cc

Please sign in to comment.