[PATCH] mm: xip_unmap ZERO_PAGE fix
Small fix to the PageReserved patch: the mips ZERO_PAGE(address) depends on address, so __xip_unmap is wrong to initialize page with that before address is initialized; and in fact must re-evaluate it each iteration. Signed-off-by: Hugh Dickins <hugh@veritas.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
508034a32b
commit
67b02f119d
1 changed files with 2 additions and 1 deletions
|
@ -174,7 +174,7 @@ __xip_unmap (struct address_space * mapping,
|
|||
unsigned long address;
|
||||
pte_t *pte;
|
||||
pte_t pteval;
|
||||
struct page *page = ZERO_PAGE(address);
|
||||
struct page *page;
|
||||
|
||||
spin_lock(&mapping->i_mmap_lock);
|
||||
vma_prio_tree_foreach(vma, &iter, &mapping->i_mmap, pgoff, pgoff) {
|
||||
|
@ -182,6 +182,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);
|
||||
/*
|
||||
* We need the page_table_lock to protect us from page faults,
|
||||
* munmap, fork, etc...
|
||||
|
|
Loading…
Reference in a new issue