diff options
authorMel Gorman <>2012-10-19 13:56:57 -0700
committerLinus Torvalds <>2012-10-19 14:07:47 -0700
commit0db63d7e25f96e2c6da925c002badf6f144ddf30 (patch)
parentbac716966094e39c8027428993a57b79f2dd6c97 (diff)
mm: compaction: correct the nr_strict va isolated check for CMA
Thierry reported that the "iron out" patch for isolate_freepages_block() had problems due to the strict check being too strict with "mm: compaction: Iron out isolate_freepages_block() and isolate_freepages_range() -fix1". It's possible that more pages than necessary are isolated but the check still fails and I missed that this fix was not picked up before RC1. This same problem has been identified in 3.7-RC1 by Tony Prisk and should be addressed by the following patch. Signed-off-by: Mel Gorman <> Tested-by: Tony Prisk <> Reported-by: Thierry Reding <> Acked-by: Rik van Riel <> Acked-by: Minchan Kim <> Cc: Richard Davies <> Cc: Shaohua Li <> Cc: Avi Kivity <> Cc: Arnd Bergmann <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/compaction.c b/mm/compaction.c
index 2c4ce17651d..9eef55838fc 100644
--- a/mm/compaction.c
+++ b/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)