1 files changed, 10 insertions, 1 deletions

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index c57740bb203a..ec7b86ebf9d9 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -928,8 +928,14 @@ struct page *alloc_huge_page_node(struct hstate *h, int nid)
         page = dequeue_huge_page_node(h, nid);
         spin_unlock(&hugetlb_lock);
 
-        if (!page)
+        if (!page) {
                 page = alloc_buddy_huge_page(h, nid);
+                if (page) {
+                        spin_lock(&hugetlb_lock);
+                        list_move(&page->lru, &h->hugepage_activelist);
+                        spin_unlock(&hugetlb_lock);
+                }
+        }
 
         return page;
 }
@@ -1155,6 +1161,9 @@ static struct page *alloc_huge_page(struct vm_area_struct *vma,
                         hugepage_subpool_put_pages(spool, chg);
                         return ERR_PTR(-ENOSPC);
                 }
+                spin_lock(&hugetlb_lock);
+                list_move(&page->lru, &h->hugepage_activelist);
+                spin_unlock(&hugetlb_lock);
         }
 
         set_page_private(page, (unsigned long)spool);