Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...

[linux-2.6-block.git] / mm / migrate.c

diff --git a/mm/migrate.c b/mm/migrate.c
index 4d0be47a322a8a33491c94072100ebcec829becd..1e5525a256910629d2dc2d15d14f13d06f2aa1d7 100644 (file)
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1323,9 +1323,8 @@ put_anon:
                put_anon_vma(anon_vma);
 
        if (rc == MIGRATEPAGE_SUCCESS) {
-               hugetlb_cgroup_migrate(hpage, new_hpage);
+               move_hugetlb_state(hpage, new_hpage, reason);
                put_new_page = NULL;
-               set_page_owner_migrate_reason(new_hpage, reason);
        }
 
        unlock_page(hpage);