From 5843001eb8e58acecf32f794189193eb82d963b7 Mon Sep 17 00:00:00 2001 From: Andrew Dodd Date: Sat, 16 Feb 2013 19:32:40 -0500 Subject: mm: Update Samsung's -cma shit to match 3.0.64 Samsung forked compaction and page_alloc to compaction-cma and page_alloc-cma - fix stuff that breaks. We may need to update more later. Change-Id: I8325611e4e41af22688553a835dbc490c70793e1 --- mm/compaction-cma.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'mm/compaction-cma.c') diff --git a/mm/compaction-cma.c b/mm/compaction-cma.c index b5dced6..f3ce63a 100644 --- a/mm/compaction-cma.c +++ b/mm/compaction-cma.c @@ -303,7 +303,8 @@ isolate_migratepages_range(struct zone *zone, struct compact_control *cc, } /* Try isolate the page */ - if (__isolate_lru_page(page, ISOLATE_BOTH, 0) != 0) + if (__isolate_lru_page(page, + ISOLATE_ACTIVE|ISOLATE_INACTIVE, 0) != 0) continue; VM_BUG_ON(PageTransCompound(page)); @@ -659,7 +660,8 @@ static int compact_zone(struct zone *zone, struct compact_control *cc) nr_migrate = cc->nr_migratepages; err = migrate_pages(&cc->migratepages, compaction_alloc, (unsigned long)cc, false, - cc->sync, 0); + cc->sync ? MIGRATE_SYNC_LIGHT : MIGRATE_ASYNC + , 0); update_nr_listpages(cc); nr_remaining = cc->nr_migratepages; -- cgit v1.1