summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorKrishna Reddy <vdumpa@nvidia.com>2014-09-03 12:16:07 -0700
committerWinnie Hsu <whsu@nvidia.com>2014-11-05 16:03:09 -0800
commit204516bf4c8441ca1c58e55b0f1ba2583962eee4 (patch)
tree0381fc68669608084a019be2a420058e2c014526 /mm
parentc1dced9d6dd1ecf754373b29e7c74410f6ebd01e (diff)
mm: compaction: don't restrict page isolation during CMA page migration
don't limit the number of pages isolated during CMA page migration. Bug 1550455 Change-Id: Ib6edcb090b30212302543098a05b85e669ade45d Signed-off-by: Krishna Reddy <vdumpa@nvidia.com> Reviewed-on: http://git-master/r/495283 (cherry picked from commit ec9ed2b5c4418c658fe2a3b00b0baf6179b3b452) Reviewed-on: http://git-master/r/592898 GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'mm')
-rw-r--r--mm/compaction.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/compaction.c b/mm/compaction.c
index 18a90b4d0bfc..be153e26c57d 100644
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -617,7 +617,8 @@ isolate_migratepages_range(struct zone *zone, struct compact_control *cc,
check_compact_cluster:
/* Avoid isolating too much */
- if (cc->nr_migratepages == COMPACT_CLUSTER_MAX) {
+ if (cc->nr_migratepages == COMPACT_CLUSTER_MAX &&
+ !is_cma_page(pfn_to_page(low_pfn))) {
++low_pfn;
break;
}