---

yaml --- r: 16301 b: refs/heads/master c: 85ef47f h: refs/heads/master i: 16299: 1948bcb v: v3
git-mirror · Jan 6, 2006 · 7dff35b · 7dff35b
1 parent 9627f2e
commit 7dff35b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0916794f00be44154102dedaeafe68b743078a2
+refs/heads/master: 85ef47f74afe96c8c23eaa605f28cc01443c905f
diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c
@@ -345,8 +345,8 @@ void unmap_hugepage_range(struct vm_area_struct *vma, unsigned long start,
 	flush_tlb_range(vma, start, end);
 }
 
-static struct page *find_lock_huge_page(struct address_space *mapping,
-			unsigned long idx)
+static struct page *find_or_alloc_huge_page(struct address_space *mapping,
+						unsigned long idx)
 {
 	struct page *page;
 	int err;
@@ -398,7 +398,7 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
 	 * Use page lock to guard against racing truncation
 	 * before we get page_table_lock.
 	 */
-	page = find_lock_huge_page(mapping, idx);
+	page = find_or_alloc_huge_page(mapping, idx);
 	if (!page)
 		goto out;