From 944a41dbd41c2e8b2a2bea2f9f6befc1f993c86b Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Fri, 22 Dec 2006 14:25:52 +0100 Subject: [PATCH] --- yaml --- r: 44918 b: refs/heads/master c: c2fda5fed81eea077363b285b66eafce20dfd45a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/rmap.c | 23 +++++++++++++---------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 0bde8650e782..42c32b952669 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e21654a756177bf209d7a3cbe971f16104555f75 +refs/heads/master: c2fda5fed81eea077363b285b66eafce20dfd45a diff --git a/trunk/mm/rmap.c b/trunk/mm/rmap.c index b3deda8b5019..57306fa0114d 100644 --- a/trunk/mm/rmap.c +++ b/trunk/mm/rmap.c @@ -433,7 +433,7 @@ static int page_mkclean_one(struct page *page, struct vm_area_struct *vma) { struct mm_struct *mm = vma->vm_mm; unsigned long address; - pte_t *pte, entry; + pte_t *pte; spinlock_t *ptl; int ret = 0; @@ -445,17 +445,18 @@ static int page_mkclean_one(struct page *page, struct vm_area_struct *vma) if (!pte) goto out; - if (!pte_dirty(*pte) && !pte_write(*pte)) - goto unlock; + if (pte_dirty(*pte) || pte_write(*pte)) { + pte_t entry; - entry = ptep_get_and_clear(mm, address, pte); - entry = pte_mkclean(entry); - entry = pte_wrprotect(entry); - ptep_establish(vma, address, pte, entry); - lazy_mmu_prot_update(entry); - ret = 1; + flush_cache_page(vma, address, pte_pfn(*pte)); + entry = ptep_clear_flush(vma, address, pte); + entry = pte_wrprotect(entry); + entry = pte_mkclean(entry); + set_pte_at(vma, address, pte, entry); + lazy_mmu_prot_update(entry); + ret = 1; + } -unlock: pte_unmap_unlock(pte, ptl); out: return ret; @@ -490,6 +491,8 @@ int page_mkclean(struct page *page) if (mapping) ret = page_mkclean_file(mapping, page); } + if (page_test_and_clear_dirty(page)) + ret = 1; return ret; }