diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-01-10 23:10:08 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-01-10 23:10:08 -0500 |
| commit | eed0ba0b4ab2d1668588219a8efa81bf8636a12d (patch) | |
| tree | f5aa3c732e7830a1b24e6071f8bed0f799881187 /mm/compaction.c | |
| parent | 98b14d6b290d96b24ae993ceaccc59b2aa4b130c (diff) | |
| parent | c9de9333f5a860cab82052bce6ac28bcac9b2c26 (diff) | |
Merge remote branch 'gcl/next' into next
Diffstat (limited to 'mm/compaction.c')
| -rw-r--r-- | mm/compaction.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mm/compaction.c b/mm/compaction.c index 4d709ee59013..1a8894eadf72 100644 --- a/mm/compaction.c +++ b/mm/compaction.c | |||
| @@ -279,7 +279,6 @@ static unsigned long isolate_migratepages(struct zone *zone, | |||
| 279 | /* Successfully isolated */ | 279 | /* Successfully isolated */ |
| 280 | del_page_from_lru_list(zone, page, page_lru(page)); | 280 | del_page_from_lru_list(zone, page, page_lru(page)); |
| 281 | list_add(&page->lru, migratelist); | 281 | list_add(&page->lru, migratelist); |
| 282 | mem_cgroup_del_lru(page); | ||
| 283 | cc->nr_migratepages++; | 282 | cc->nr_migratepages++; |
| 284 | 283 | ||
| 285 | /* Avoid isolating too much */ | 284 | /* Avoid isolating too much */ |