---

yaml --- r: 283024 b: refs/heads/master c: 0c176d5 h: refs/heads/master v: v3
git-mirror · Jan 11, 2012 · cdaa8f3 · cdaa8f3
1 parent a23bf48
commit cdaa8f3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86cfd3a45042ab242d47f3935a02811a402beab6
+refs/heads/master: 0c176d52b0b2619f231b2bbf329b90c028134f58
diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c
@@ -2315,8 +2315,7 @@ 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 = ((address - vma->vm_start) >> PAGE_SHIFT)
-		+ (vma->vm_pgoff >> PAGE_SHIFT);
+	pgoff = vma_hugecache_offset(h, vma, address);
 	mapping = (struct address_space *)page_private(page);
 
 	/*