---

yaml --- r: 311822 b: refs/heads/master c: 4bf2bba h: refs/heads/master v: v3
git-mirror · Jul 11, 2012 · 8fe4af4 · 8fe4af4
1 parent cd92810
commit 8fe4af4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4229fb1dc6843c49a14bb098719f8a696cdc44f8
+refs/heads/master: 4bf2bba3750f10aa9e62e6949bc7e8329990f01b
diff --git a/trunk/mm/compaction.c b/trunk/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: