diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-21 23:34:31 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-21 23:34:31 +0200 |
| commit | 088eb2a84b3b093af60bbe0b65151e8a9cd2d57d (patch) | |
| tree | 8f145d8c71f6e249d6664b5482ac216b8c6e4016 /mm/compaction.c | |
| parent | 6217a69a1e38807b3046b4fd6e4bf413e0e03b67 (diff) | |
| parent | 84a1caf1453c3d44050bd22db958af4a7f99315c (diff) | |
Merge tag 'v3.5-rc7' into late/soc
Linux 3.5-rc7
Diffstat (limited to 'mm/compaction.c')
| -rw-r--r-- | mm/compaction.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mm/compaction.c b/mm/compaction.c index 7ea259d82a99..2f42d9528539 100644 --- 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: |