diff options
Diffstat (limited to 'mm')
-rw-r--r-- | mm/memory.c | 4 | ||||
-rw-r--r-- | mm/rmap.c | 2 |
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); |
@@ -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. */ |