From 68fdc5352f591fea95505fc4599882564084b1df Mon Sep 17 00:00:00 2001
From: Dean Nelson <dnelson@redhat.com>
Date: Thu, 2 Dec 2010 14:31:12 -0800
Subject: [PATCH] --- yaml --- r: 222863 b: refs/heads/master c:
 1f64d69c7ad2e48e697493e45590679f7a69b7b2 h: refs/heads/master i:   222861:
 e8b08c26a741350b3ae49d224fc188ae166d4e22   222859:
 49e5680cc589a95fe5a749e1530700bcce054477   222855:
 45660060abe532b3b0495f30da6b5d8dc6ee2efc   222847:
 61c88f69670f24258bf08c082f272cab790e8dfe v: v3

---
 [refs]             | 2 +-
 trunk/mm/hugetlb.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5f9955492aec..1d318f709374 100644
--- 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
index c4a3558589ab..85855240933d 100644
--- 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);