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);