Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 7561e8ca0dfaf6fca3feef982830de3b65300e5b

Authored by David Howells
Committed by Linus Torvalds
1 parent 39f1cd635c
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

NOMMU: Revert 'nommu: get_user_pages(): pin last page on non-page-aligned start' 

Revert the following patch:

	commit c08c6e1f54c85fc299cf9f88cf330d6dd28a9a1d
	Author: Steven J. Magnani <steve@digidescorp.com>
	Date:   Fri Mar 5 13:42:24 2010 -0800

	nommu: get_user_pages(): pin last page on non-page-aligned start

As it assumes that the mappings begin at the start of pages - something that
isn't necessarily true on NOMMU systems.  On NOMMU systems, it is possible for
a mapping to only occupy part of the page, and not necessarily touch either end
of it; in fact it's also possible for multiple non-overlapping mappings to
coexist on one page (consider direct mappings of ROMFS files, for example).

Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Steven J. Magnani <steve@digidescorp.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

... ... @@ -146,7 +146,7 @@
146 146 (VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE);
147 147  
148 148 for (i = 0; i < nr_pages; i++) {
149   - vma = find_extend_vma(mm, start);
  149 + vma = find_vma(mm, start);
150 150 if (!vma)
151 151 goto finish_or_fault;
152 152  
... ... @@ -764,7 +764,7 @@
764 764 */
765 765 struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
766 766 {
767   - return find_vma(mm, addr & PAGE_MASK);
  767 + return find_vma(mm, addr);
768 768 }
769 769  
770 770 /*