diff options
| author | Hugh Dickins <hugh@veritas.com> | 2005-10-29 18:16:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 21:40:41 -0700 |
| commit | 67b02f119df50ffad5a4e9e53ea4c896535862cd (patch) | |
| tree | 9d651e9e62b6ead325fc6bd872f3a6232d85e8a3 /mm/filemap_xip.c | |
| parent | 508034a32b819a2d40aa7ac0dbc8cd2e044c2de6 (diff) | |
| download | linux-3.10-67b02f119df50ffad5a4e9e53ea4c896535862cd.tar.gz linux-3.10-67b02f119df50ffad5a4e9e53ea4c896535862cd.tar.bz2 linux-3.10-67b02f119df50ffad5a4e9e53ea4c896535862cd.zip | |
[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>
Diffstat (limited to 'mm/filemap_xip.c')
| -rw-r--r-- | mm/filemap_xip.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/filemap_xip.c b/mm/filemap_xip.c index 9354ee279b1..4e74ad60339 100644 --- a/mm/filemap_xip.c +++ b/mm/filemap_xip.c @@ -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... |