Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0da7e01f authored by Dean Nelson's avatar Dean Nelson Committed by Linus Torvalds
Browse files

calculation of pgoff in do_linear_fault() uses mixed units 



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: default avatarDean Nelson <dcn@sgi.com>
Acked-by: default avatarNick Piggin <npiggin@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2408c550

mm/memory.c

+1 −1
Original line number Diff line number Diff line
@@ -2361,7 +2361,7 @@ static int do_linear_fault(struct mm_struct *mm, struct vm_area_struct *vma, 
		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);



	pte_unmap(page_table);