From 204516bf4c8441ca1c58e55b0f1ba2583962eee4 Mon Sep 17 00:00:00 2001 From: Krishna Reddy Date: Wed, 3 Sep 2014 12:16:07 -0700 Subject: 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 Reviewed-on: http://git-master/r/495283 (cherry picked from commit ec9ed2b5c4418c658fe2a3b00b0baf6179b3b452) Reviewed-on: http://git-master/r/592898 GVS: Gerrit_Virtual_Submit --- mm/compaction.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mm') 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; } -- cgit v1.2.3