diff --git a/[refs] b/[refs]
index 5515f8a3f3bf..44d8ee0d1059 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 027ef6c87853b0a9df53175063028edb4950d476
+refs/heads/master: 36e4f20af833d1ce196e6a4ade05dc26c44652d1
diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c
index 8536741f069b..de5d1dcf34fe 100644
--- a/trunk/mm/hugetlb.c
+++ b/trunk/mm/hugetlb.c
@@ -2480,7 +2480,8 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
 	 * from page cache lookup which is in HPAGE_SIZE units.
 	 */
 	address = address & huge_page_mask(h);
-	pgoff = vma_hugecache_offset(h, vma, address);
+	pgoff = ((address - vma->vm_start) >> PAGE_SHIFT) +
+			vma->vm_pgoff;
 	mapping = vma->vm_file->f_dentry->d_inode->i_mapping;
 
 	/*