diff options
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/memory.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/memory.c b/mm/memory.c index 8adb5b756264..032f05cd6a2f 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
| @@ -3124,8 +3124,7 @@ static int do_fault(struct mm_struct *mm, struct vm_area_struct *vma, | |||
| 3124 | unsigned long address, pte_t *page_table, pmd_t *pmd, | 3124 | unsigned long address, pte_t *page_table, pmd_t *pmd, |
| 3125 | unsigned int flags, pte_t orig_pte) | 3125 | unsigned int flags, pte_t orig_pte) |
| 3126 | { | 3126 | { |
| 3127 | pgoff_t pgoff = (((address & PAGE_MASK) | 3127 | pgoff_t pgoff = linear_page_index(vma, address); |
| 3128 | - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff; | ||
| 3129 | 3128 | ||
| 3130 | pte_unmap(page_table); | 3129 | pte_unmap(page_table); |
| 3131 | /* The VMA was not fully populated on mmap() or missing VM_DONTEXPAND */ | 3130 | /* The VMA was not fully populated on mmap() or missing VM_DONTEXPAND */ |