From: dcn@sgi.com (Dean Nelson) The calculation of pgoff in do_linear_fault() should use PAGE_SHIFT and not PAGE_CACHE_SHIFT since vma->vm_pgoff is in units of PAGE_SIZE and not PAGE_CACHE_SIZE. At the moment linux/pagemap.h has PAGE_CACHE_SHIFT defined as PAGE_SHIFT, but should that ever change this calculation would break. Signed-off-by: Dean Nelson Acked-by: Nick Piggin Signed-off-by: Andrew Morton --- mm/memory.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) diff -puN mm/memory.c~calculation-of-pgoff-in-do_linear_fault-uses-mixed mm/memory.c --- a/mm/memory.c~calculation-of-pgoff-in-do_linear_fault-uses-mixed +++ a/mm/memory.c @@ -2356,7 +2356,7 @@ static int do_linear_fault(struct mm_str int write_access, pte_t orig_pte) { pgoff_t pgoff = (((address & PAGE_MASK) - - vma->vm_start) >> PAGE_CACHE_SHIFT) + vma->vm_pgoff; + - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff; unsigned int flags = (write_access ? FAULT_FLAG_WRITE : 0); return __do_fault(mm, vma, address, page_table, pmd, pgoff, _