---

yaml --- r: 222863 b: refs/heads/master c: 1f64d69 h: refs/heads/master i: 222861: e8b08c2 222859: 49e5680 222855: 4566006 222847: 61c88f6 v: v3
git-mirror · Dec 2, 2010 · 68fdc53 · 68fdc53
1 parent 40f64e8
commit 68fdc53
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94c35de9a918665d9354efe2bafc29ba4b37497a
+refs/heads/master: 1f64d69c7ad2e48e697493e45590679f7a69b7b2
diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c
@@ -2738,7 +2738,8 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
 		unlock_page(pagecache_page);
 		put_page(pagecache_page);
 	}
-	unlock_page(page);
+	if (page != pagecache_page)
+		unlock_page(page);
 
 out_mutex:
 	mutex_unlock(&hugetlb_instantiation_mutex);