Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 23 insertions, 13 deletions

diff --git a/mm/rmap.c b/mm/rmap.c
index d8a842a586db..669acb22b572 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -47,6 +47,7 @@
 #include <linux/rmap.h>
 #include <linux/rcupdate.h>
 #include <linux/module.h>
+#include <linux/kallsyms.h>
 
 #include <asm/tlbflush.h>
 
@@ -432,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;
 
@@ -444,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(mm, address, pte, entry);
+                lazy_mmu_prot_update(entry);
+                ret = 1;
+        }
 
-unlock:
         pte_unmap_unlock(pte, ptl);
 out:
         return ret;
@@ -489,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;
 }
@@ -567,14 +571,20 @@ void page_add_file_rmap(struct page *page)
  *
  * The caller needs to hold the pte lock.
  */
-void page_remove_rmap(struct page *page)
+void page_remove_rmap(struct page *page, struct vm_area_struct *vma)
 {
         if (atomic_add_negative(-1, &page->_mapcount)) {
                 if (unlikely(page_mapcount(page) < 0)) {
                         printk (KERN_EMERG "Eeek! page_mapcount(page) went negative! (%d)\n", page_mapcount(page));
+                        printk (KERN_EMERG "  page pfn = %lx\n", page_to_pfn(page));
                         printk (KERN_EMERG "  page->flags = %lx\n", page->flags);
                         printk (KERN_EMERG "  page->count = %x\n", page_count(page));
                         printk (KERN_EMERG "  page->mapping = %p\n", page->mapping);
+                        print_symbol (KERN_EMERG "  vma->vm_ops = %s\n", (unsigned long)vma->vm_ops);
+                        if (vma->vm_ops)
+                                print_symbol (KERN_EMERG "  vma->vm_ops->nopage = %s\n", (unsigned long)vma->vm_ops->nopage);
+                        if (vma->vm_file && vma->vm_file->f_op)
+                                print_symbol (KERN_EMERG "  vma->vm_file->f_op->mmap = %s\n", (unsigned long)vma->vm_file->f_op->mmap);
                         BUG();
                 }
 
@@ -679,7 +689,7 @@ static int try_to_unmap_one(struct page *page, struct vm_area_struct *vma,
                 dec_mm_counter(mm, file_rss);
 
 
-        page_remove_rmap(page);
+        page_remove_rmap(page, vma);
         page_cache_release(page);
 
 out_unmap:
@@ -769,7 +779,7 @@ static void try_to_unmap_cluster(unsigned long cursor,
                 if (pte_dirty(pteval))
                         set_page_dirty(page);
 
-                page_remove_rmap(page);
+                page_remove_rmap(page, vma);
                 page_cache_release(page);
                 dec_mm_counter(mm, file_rss);
                 (*mapcount)--;