diff --git a/[refs] b/[refs] index ace678cbf7f6..9964f2beaa96 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bac716966094e39c8027428993a57b79f2dd6c97 +refs/heads/master: 0db63d7e25f96e2c6da925c002badf6f144ddf30 diff --git a/trunk/mm/compaction.c b/trunk/mm/compaction.c index 2c4ce17651d8..9eef55838fca 100644 --- a/trunk/mm/compaction.c +++ b/trunk/mm/compaction.c @@ -346,7 +346,7 @@ static unsigned long isolate_freepages_block(struct compact_control *cc, * pages requested were isolated. If there were any failures, 0 is * returned and CMA will fail. */ - if (strict && nr_strict_required != total_isolated) + if (strict && nr_strict_required > total_isolated) total_isolated = 0; if (locked)