The patch titled
Subject: mm: migrate: consolidate mem_cgroup_migrate() calls
has been removed from the -mm tree. Its filename was
mm-migrate-consolidate-mem_cgroup_migrate-calls.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Johannes Weiner <hannes@xxxxxxxxxxx>
Subject: mm: migrate: consolidate mem_cgroup_migrate() calls
Rather than scattering mem_cgroup_migrate() calls all over the place, have
a single call from a safe place where every migration operation eventually
ends up in - migrate_page_copy().
Signed-off-by: Johannes Weiner <hannes@xxxxxxxxxxx>
Suggested-by: Hugh Dickins <hughd@xxxxxxxxxx>
Acked-by: Vladimir Davydov <vdavydov@xxxxxxxxxxxxx>
Acked-by: Michal Hocko <mhocko@xxxxxxxx>
Cc: Mateusz Guzik <mguzik@xxxxxxxxxx>
Cc: Sergey Senozhatsky <sergey.senozhatsky.work@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/migrate.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff -puN mm/migrate.c~mm-migrate-consolidate-mem_cgroup_migrate-calls mm/migrate.c
--- a/mm/migrate.c~mm-migrate-consolidate-mem_cgroup_migrate-calls
+++ a/mm/migrate.c
@@ -331,8 +331,6 @@ int migrate_page_move_mapping(struct add
if (PageSwapBacked(page))
SetPageSwapBacked(newpage);
- mem_cgroup_migrate(page, newpage);
-
return MIGRATEPAGE_SUCCESS;
}
@@ -428,8 +426,6 @@ int migrate_page_move_mapping(struct add
}
local_irq_enable();
- mem_cgroup_migrate(page, newpage);
-
return MIGRATEPAGE_SUCCESS;
}
@@ -471,8 +467,6 @@ int migrate_huge_page_move_mapping(struc
spin_unlock_irq(&mapping->tree_lock);
- mem_cgroup_migrate(page, newpage);
-
return MIGRATEPAGE_SUCCESS;
}
@@ -586,6 +580,8 @@ void migrate_page_copy(struct page *newp
end_page_writeback(newpage);
copy_page_owner(page, newpage);
+
+ mem_cgroup_migrate(page, newpage);
}
/************************************************************
@@ -1846,7 +1842,6 @@ fail_putback:
}
mlock_migrate_page(new_page, page);
- mem_cgroup_migrate(page, new_page);
page_remove_rmap(page, true);
set_page_owner_migrate_reason(new_page, MR_NUMA_MISPLACED);
_
Patches currently in -mm which might be from hannes@xxxxxxxxxxx are
mm-oom_kill-dont-ignore-oom-score-on-exiting-tasks.patch
mm-scale-kswapd-watermarks-in-proportion-to-memory.patch
mm-scale-kswapd-watermarks-in-proportion-to-memory-v3.patch
mm-memcontrol-reclaim-when-shrinking-memoryhigh-below-usage.patch
mm-memcontrol-reclaim-and-oom-kill-when-shrinking-memorymax-below-usage.patch
mm-memcontrol-clarify-the-uncharge_list-loop.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
