diff --git a/[refs] b/[refs] index 19e2af23a9c2..7cf9b86b1575 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 41a25e7e67b8be33d7598ff7968b9a8b405b6567 +refs/heads/master: 57dd28fb0513d2f772bb215f27925165e7b9ce5f diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c index f10cc274a7d9..c001f846f17d 100644 --- a/trunk/mm/hugetlb.c +++ b/trunk/mm/hugetlb.c @@ -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 @@ -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;