diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-27 01:37:05 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-27 01:37:05 -0500 |
| commit | 17f7f4d9fcce8f1b75b5f735569309dee7665968 (patch) | |
| tree | 14d7e49ca0053a0fcab3c33b5023bf3f90c5c08a /mm/compaction.c | |
| parent | 041110a439e21cd40709ead4ffbfa8034619ad77 (diff) | |
| parent | d7c1255a3a21e98bdc64df8ccf005a174d7e6289 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/ipv4/fib_frontend.c
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 */ |