This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / mm / rmap.c

diff --git a/mm/rmap.c b/mm/rmap.c
index e6010e4..76a2224 100644 (file)
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -35,7 +35,6 @@
  *         mm->page_table_lock
  *           zone->lru_lock (in mark_page_accessed)
  *           swap_list_lock (in swap_free etc's swap_info_get)
- *             mmlist_lock (in mmput, drain_mmlist and others)
  *             swap_device_lock (in swap_duplicate, swap_info_get)
  *             mapping->private_lock (in __set_page_dirty_buffers)
  *             inode_lock (in set_page_dirty's __mark_inode_dirty)
@@ -397,9 +396,6 @@ int page_referenced(struct page *page, int is_locked, int ignore_token)
 {
        int referenced = 0;
 
-       if (!swap_token_default_timeout)
-               ignore_token = 1;
-
        if (page_test_and_clear_young(page))
                referenced++;
 
@@ -587,11 +583,6 @@ static int try_to_unmap_one(struct page *page, struct vm_area_struct *vma)
                 */
                BUG_ON(!PageSwapCache(page));
                swap_duplicate(entry);
-               if (list_empty(&mm->mmlist)) {
-                       spin_lock(&mmlist_lock);
-                       list_add(&mm->mmlist, &init_mm.mmlist);
-                       spin_unlock(&mmlist_lock);
-               }
                set_pte(pte, swp_entry_to_pte(entry));
                BUG_ON(pte_file(*pte));
                mm->anon_rss--;