diff options
| author | Andrew Dodd <atd7@cornell.edu> | 2013-02-16 19:32:40 -0500 |
|---|---|---|
| committer | Andrew Dodd <atd7@cornell.edu> | 2013-02-27 09:19:13 -0500 |
| commit | 5843001eb8e58acecf32f794189193eb82d963b7 (patch) | |
| tree | 40ca872628e9f8b006ffe32db9aabb6361603079 /mm/compaction-cma.c | |
| parent | 19dd8724942d4998ccaa090daa2a69b33648d2bb (diff) | |
| download | kernel_samsung_smdk4412-5843001eb8e58acecf32f794189193eb82d963b7.zip kernel_samsung_smdk4412-5843001eb8e58acecf32f794189193eb82d963b7.tar.gz kernel_samsung_smdk4412-5843001eb8e58acecf32f794189193eb82d963b7.tar.bz2 | |
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
Diffstat (limited to 'mm/compaction-cma.c')
| -rw-r--r-- | mm/compaction-cma.c | 6 |
1 files changed, 4 insertions, 2 deletions
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; |