---

yaml --- r: 164393 b: refs/heads/master c: 5205e56 h: refs/heads/master i: 164391: c38f9cb v: v3
git-mirror · Sep 22, 2009 · aafd829 · aafd829
1 parent 5a9ef6e
commit aafd829
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de2e7567c7ddf24f0ca80010163ed10da66a14e2
+refs/heads/master: 5205e56eeab04ce02f8bb6b47d1569b216bc0b6a
diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
@@ -1278,10 +1278,6 @@ static void move_active_pages_to_lru(struct zone *zone,
 		VM_BUG_ON(PageLRU(page));
 		SetPageLRU(page);
 
-		VM_BUG_ON(!PageActive(page));
-		if (!is_active_lru(lru))
-			ClearPageActive(page);	/* we are de-activating */
-
 		list_move(&page->lru, &zone->lru[lru].list);
 		mem_cgroup_add_lru_list(page, lru);
 		pgmoved++;
@@ -1363,6 +1359,7 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone,
 			}
 		}
 
+		ClearPageActive(page);	/* we are de-activating */
 		list_add(&page->lru, &l_inactive);
 	}