Merge branch 'akpm/master'

[karo-tx-linux.git] / mm / migrate.c

diff --git a/mm/migrate.c b/mm/migrate.c
index 8bedba135c368b857ae8014c6e69e3f604ed5434..90cbf7c65caccad698b2f9856983fca4d40b3413 100644 (file)
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -331,8 +331,6 @@ int migrate_page_move_mapping(struct address_space *mapping,
                if (PageSwapBacked(page))
                        SetPageSwapBacked(newpage);
 
-               mem_cgroup_migrate(page, newpage);
-
                return MIGRATEPAGE_SUCCESS;
        }
 
@@ -379,8 +377,6 @@ int migrate_page_move_mapping(struct address_space *mapping,
        if (PageSwapBacked(page))
                SetPageSwapBacked(newpage);
 
-       mem_cgroup_migrate(page, newpage);
-
        get_page(newpage);      /* add cache reference */
        if (PageSwapCache(page)) {
                SetPageSwapCache(newpage);
@@ -463,8 +459,6 @@ int migrate_huge_page_move_mapping(struct address_space *mapping,
        newpage->index = page->index;
        newpage->mapping = page->mapping;
 
-       mem_cgroup_migrate(page, newpage);
-
        get_page(newpage);
 
        radix_tree_replace_slot(pslot, newpage);
@@ -472,6 +466,7 @@ int migrate_huge_page_move_mapping(struct address_space *mapping,
        page_unfreeze_refs(page, expected_count - 1);
 
        spin_unlock_irq(&mapping->tree_lock);
+
        return MIGRATEPAGE_SUCCESS;
 }
 
@@ -585,6 +580,8 @@ void migrate_page_copy(struct page *newpage, struct page *page)
                end_page_writeback(newpage);
 
        copy_page_owner(page, newpage);
+
+       mem_cgroup_migrate(page, newpage);
 }
 
 /************************************************************
@@ -1845,7 +1842,6 @@ fail_putback:
        }
 
        mlock_migrate_page(new_page, page);
-       mem_cgroup_migrate(page, newpage);
        page_remove_rmap(page, true);
        set_page_owner_migrate_reason(new_page, MR_NUMA_MISPLACED);