Subject: [folded-merged] mm-compaction-embed-migration-mode-in-compact_control-fix-fix.patch removed from -mm tree To: iamjoonsoo.kim@xxxxxxx,minchan@xxxxxxxxxx,rientjes@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Wed, 04 Jun 2014 15:29:19 -0700 The patch titled Subject: CMA: use MIGRATE_SYNC in alloc_contig_range() has been removed from the -mm tree. Its filename was mm-compaction-embed-migration-mode-in-compact_control-fix-fix.patch This patch was dropped because it was folded into mm-compaction-embed-migration-mode-in-compact_control.patch ------------------------------------------------------ From: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx> Subject: CMA: use MIGRATE_SYNC in alloc_contig_range() Before commit 'mm, compaction: embed migration mode in compact_control' from David is merged, alloc_contig_range() used sync migration, instead of sync_light migration. This doesn't break anything currently because page isolation doesn't have any difference with sync and sync_light, but it could in the future, so change back as it was. And pass cc->mode to migrate_pages(), instead of passing MIGRATE_SYNC to migrate_pages(). Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx> Acked-by: Minchan Kim <minchan@xxxxxxxxxx> Acked-by: David Rientjes <rientjes@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/page_alloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN mm/page_alloc.c~mm-compaction-embed-migration-mode-in-compact_control-fix-fix mm/page_alloc.c --- a/mm/page_alloc.c~mm-compaction-embed-migration-mode-in-compact_control-fix-fix +++ a/mm/page_alloc.c @@ -6213,7 +6213,7 @@ static int __alloc_contig_migrate_range( cc->nr_migratepages -= nr_reclaimed; ret = migrate_pages(&cc->migratepages, alloc_migrate_target, - NULL, 0, MIGRATE_SYNC, MR_CMA); + NULL, 0, cc->mode, MR_CMA); } if (ret < 0) { putback_movable_pages(&cc->migratepages); @@ -6252,7 +6252,7 @@ int alloc_contig_range(unsigned long sta .nr_migratepages = 0, .order = -1, .zone = page_zone(pfn_to_page(start)), - .mode = MIGRATE_SYNC_LIGHT, + .mode = MIGRATE_SYNC, .ignore_skip_hint = true, }; INIT_LIST_HEAD(&cc.migratepages); _ Patches currently in -mm which might be from iamjoonsoo.kim@xxxxxxx are origin.patch mm-page_alloc-prevent-migrate_reserve-pages-from-being-misplaced.patch mm-compaction-clean-up-unused-code-lines.patch mm-compaction-cleanup-isolate_freepages.patch mm-swapc-clean-up-lru_cache_add-functions.patch mm-compaction-embed-migration-mode-in-compact_control.patch mm-compaction-do-not-count-migratepages-when-unnecessary.patch mm-compaction-avoid-rescanning-pageblocks-in-isolate_freepages.patch mm-page_alloc-use-word-based-accesses-for-get-set-pageblock-bitmaps.patch mm-compaction-properly-signal-and-act-upon-lock-and-need_sched-contention.patch zram-correct-offset-usage-in-zram_bio_discard.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