[PATCH] mm: mremap correct rmap accounting
Nick Piggin points out that page accounting on MIPS multiple ZERO_PAGEs is not maintained by its move_pte, and could lead to freeing a ZERO_PAGE. Instead of complicating that move_pte, just forget the minor optimization when mremapping, and change the one thing which needed it for correctness - filemap_xip use ZERO_PAGE(0) throughout instead of according to address. [ "There is no block device driver one could use for XIP on mips platforms" - Carsten Otte ] Signed-off-by: Hugh Dickins <hugh@veritas.com> Cc: Nick Piggin <nickpiggin@yahoo.com.au> Cc: Andrew Morton <akpm@osdl.org> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Carsten Otte <cotte@de.ibm.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
8339f0008c
commit
701dfbc1cb
@@ -183,7 +183,7 @@ __xip_unmap (struct address_space * mapping,
|
||||
address = vma->vm_start +
|
||||
((pgoff - vma->vm_pgoff) << PAGE_SHIFT);
|
||||
BUG_ON(address < vma->vm_start || address >= vma->vm_end);
|
||||
page = ZERO_PAGE(address);
|
||||
page = ZERO_PAGE(0);
|
||||
pte = page_check_address(page, mm, address, &ptl);
|
||||
if (pte) {
|
||||
/* Nuke the page table entry. */
|
||||
@@ -246,7 +246,7 @@ xip_file_nopage(struct vm_area_struct * area,
|
||||
__xip_unmap(mapping, pgoff);
|
||||
} else {
|
||||
/* not shared and writable, use ZERO_PAGE() */
|
||||
page = ZERO_PAGE(address);
|
||||
page = ZERO_PAGE(0);
|
||||
}
|
||||
|
||||
out:
|
||||
|
Reference in New Issue
Block a user