mm, thp: abort compaction if migration page cannot be charged to memcg

[platform/adaptation/renesas_rcar/renesas_kernel.git] / mm / compaction.c

diff --git a/mm/compaction.c b/mm/compaction.c
index 7ea259d..2f42d95 100644 (file)
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -701,8 +701,11 @@ static int compact_zone(struct zone *zone, struct compact_control *cc)
                if (err) {
                        putback_lru_pages(&cc->migratepages);
                        cc->nr_migratepages = 0;
+                       if (err == -ENOMEM) {
+                               ret = COMPACT_PARTIAL;
+                               goto out;
+                       }
                }
-
        }
 
 out: