diff --git a/[refs] b/[refs]
index b44057cf7e9b..962d4a2d1c02 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6692183ac1d8f4a4e4015f9ce9acc2514618e0b
+refs/heads/master: 78c997a4be7d1ed3ff4c27f23d30a0185d39bcbf
diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c
index d87885eb4acc..832f676ca038 100644
--- a/trunk/mm/hugetlb.c
+++ b/trunk/mm/hugetlb.c
@@ -334,6 +334,7 @@ static unsigned long set_max_huge_pages(unsigned long count)
 		return nr_huge_pages;
 
 	spin_lock(&hugetlb_lock);
+	count = max(count, reserved_huge_pages);
 	try_to_free_low(count);
 	while (count < nr_huge_pages) {
 		struct page *page = dequeue_huge_page(NULL, 0);