---

yaml --- r: 24851 b: refs/heads/master c: 78c997a h: refs/heads/master i: 24849: bb89a0f 24847: 7e124a7 v: v3
git-mirror · Mar 31, 2006 · bf2b8aa · bf2b8aa
1 parent de92287
commit bf2b8aa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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);