X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=mm%2Fhugetlb.c;h=85855240933d7cf195ce1548faa75d8120c21478;hb=7ccbefe07ea0a3570e44d1ec13a307552ee4dadd;hp=c4a3558589ab15de3ac9abb135ee499d17544142;hpb=67cb40560940ba36de22d66f0d5d8efe235c8bb1;p=deliverable%2Flinux.git

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index c4a3558589ab..85855240933d 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -2738,7 +2738,8 @@ out_page_table_lock:
 		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);