aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Collins <bcollins@debian.org>2005-11-29 14:45:26 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-29 15:57:17 -0500
commiteca351336acb2fa943611e0846562ce3997ef53b (patch)
tree9b7b022d7b2d5f2f23bc979fa8bf5c1e418456bd
parentd70aa5e4b54aa7e704c886838715ac8a45d5750f (diff)
[PATCH] Fix missing pfn variables caused by vm changes
I image this showed up because of "unused var..." when the changes occured, because flush_cache_page() is a noop in most places. This showed up for me on parisc however, where flush_cache_page() is a real function. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--mm/memory.c4
-rw-r--r--mm/rmap.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/mm/memory.c b/mm/memory.c
index 6c1eac92a316..74839b3a3999 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1345,7 +1345,7 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma,
1345 int reuse = can_share_swap_page(old_page); 1345 int reuse = can_share_swap_page(old_page);
1346 unlock_page(old_page); 1346 unlock_page(old_page);
1347 if (reuse) { 1347 if (reuse) {
1348 flush_cache_page(vma, address, pfn); 1348 flush_cache_page(vma, address, pte_pfn(orig_pte));
1349 entry = pte_mkyoung(orig_pte); 1349 entry = pte_mkyoung(orig_pte);
1350 entry = maybe_mkwrite(pte_mkdirty(entry), vma); 1350 entry = maybe_mkwrite(pte_mkdirty(entry), vma);
1351 ptep_set_access_flags(vma, address, page_table, entry, 1); 1351 ptep_set_access_flags(vma, address, page_table, entry, 1);
@@ -1389,7 +1389,7 @@ gotten:
1389 } 1389 }
1390 } else 1390 } else
1391 inc_mm_counter(mm, anon_rss); 1391 inc_mm_counter(mm, anon_rss);
1392 flush_cache_page(vma, address, pfn); 1392 flush_cache_page(vma, address, pte_pfn(orig_pte));
1393 entry = mk_pte(new_page, vma->vm_page_prot); 1393 entry = mk_pte(new_page, vma->vm_page_prot);
1394 entry = maybe_mkwrite(pte_mkdirty(entry), vma); 1394 entry = maybe_mkwrite(pte_mkdirty(entry), vma);
1395 ptep_establish(vma, address, page_table, entry); 1395 ptep_establish(vma, address, page_table, entry);
diff --git a/mm/rmap.c b/mm/rmap.c
index 491ac350048f..f853c6def159 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -641,7 +641,7 @@ static void try_to_unmap_cluster(unsigned long cursor,
641 continue; 641 continue;
642 642
643 /* Nuke the page table entry. */ 643 /* Nuke the page table entry. */
644 flush_cache_page(vma, address, pfn); 644 flush_cache_page(vma, address, pte_pfn(*pte));
645 pteval = ptep_clear_flush(vma, address, pte); 645 pteval = ptep_clear_flush(vma, address, pte);
646 646
647 /* If nonlinear, store the file page offset in the pte. */ 647 /* If nonlinear, store the file page offset in the pte. */