diff options
Diffstat (limited to 'mm/vmscan.c')
-rw-r--r-- | mm/vmscan.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c index ece2ecb08102..ca81d0d05c09 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c | |||
@@ -1278,10 +1278,6 @@ static void move_active_pages_to_lru(struct zone *zone, | |||
1278 | VM_BUG_ON(PageLRU(page)); | 1278 | VM_BUG_ON(PageLRU(page)); |
1279 | SetPageLRU(page); | 1279 | SetPageLRU(page); |
1280 | 1280 | ||
1281 | VM_BUG_ON(!PageActive(page)); | ||
1282 | if (!is_active_lru(lru)) | ||
1283 | ClearPageActive(page); /* we are de-activating */ | ||
1284 | |||
1285 | list_move(&page->lru, &zone->lru[lru].list); | 1281 | list_move(&page->lru, &zone->lru[lru].list); |
1286 | mem_cgroup_add_lru_list(page, lru); | 1282 | mem_cgroup_add_lru_list(page, lru); |
1287 | pgmoved++; | 1283 | pgmoved++; |
@@ -1363,6 +1359,7 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone, | |||
1363 | } | 1359 | } |
1364 | } | 1360 | } |
1365 | 1361 | ||
1362 | ClearPageActive(page); /* we are de-activating */ | ||
1366 | list_add(&page->lru, &l_inactive); | 1363 | list_add(&page->lru, &l_inactive); |
1367 | } | 1364 | } |
1368 | 1365 | ||