From cdaa8f396cc0d7c84b8b7349f433beed203c4ba7 Mon Sep 17 00:00:00 2001 From: Hillf Danton Date: Tue, 10 Jan 2012 15:08:19 -0800 Subject: [PATCH] --- yaml --- r: 283024 b: refs/heads/master c: 0c176d52b0b2619f231b2bbf329b90c028134f58 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/hugetlb.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4d2a8f6a1e79..cc7baa9174bf 100644 --- 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 index ab89d6f382d1..bb7dc405634f 100644 --- 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); /*