2.6.25-git19

 mm

diff --git a/mm/rmap.c b/mm/rmap.c
index 997f069..bf0a5b7 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -413,9 +413,6 @@ int page_referenced(struct page *page, int is_locked,
 {
    int referenced = 0;
 
-   if (page_test_and_clear_young(page))
-      referenced++;
-
    if (TestClearPageReferenced(page))
       referenced++;
 
@@ -433,6 +430,10 @@ int page_referenced(struct page *page, int is_locked,
          unlock_page(page);
       }
    }
+
+   if (page_test_and_clear_young(page))
+      referenced++;
+
    return referenced;
 }
 
@@ -661,7 +662,6 @@ void page_remove_rmap(struct page *page, struct vm_area_struct *vma)
          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);
             print_symbol (KERN_EMERG "  vma->vm_ops->fault = %s\n", (unsigned long)vma->vm_ops->fault);
          }
          if (vma->vm_file && vma->vm_file->f_op)