Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

mm: use linear_page_index() in do_fault()

do_fault() assumes that PAGE_SIZE is the same as PAGE_CACHE_SIZE.  Use
linear_page_index() to calculate pgoff in the correct units.

Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Matthew Wilcox 9 years ago
parent
fdf1cdb91b
commit
88193f7ce6
1 changed files with 1 additions and 2 deletions
Unified View Show Diff Stats
  1. 1 2
      mm/memory.c

+ 1 - 2
mm/memory.c
View File 

@@ -3124,8 +3124,7 @@ static int do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
 
 		unsigned long address, pte_t *page_table, pmd_t *pmd,
 
 		unsigned long address, pte_t *page_table, pmd_t *pmd,
 
 		unsigned int flags, pte_t orig_pte)
 
 		unsigned int flags, pte_t orig_pte)
 
 {
 
 {
 
-	pgoff_t pgoff = (((address & PAGE_MASK)
 
-			- vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff;
 
+	pgoff_t pgoff = linear_page_index(vma, address);
 
 
 
 	pte_unmap(page_table);
 
 	pte_unmap(page_table);
 
 	/* The VMA was not fully populated on mmap() or missing VM_DONTEXPAND */
 
 	/* The VMA was not fully populated on mmap() or missing VM_DONTEXPAND */