From aafd829fe9ab2d8a2f4e494fc6d1d00d1aab003f Mon Sep 17 00:00:00 2001
From: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Date: Mon, 21 Sep 2009 17:01:44 -0700
Subject: [PATCH] --- yaml --- r: 164393 b: refs/heads/master c:
 5205e56eeab04ce02f8bb6b47d1569b216bc0b6a h: refs/heads/master i:   164391:
 c38f9cb677d94c1b3181e44583c8731e5e3187fd v: v3

---
 [refs]            | 2 +-
 trunk/mm/vmscan.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index eaaaad6773f1..a5c2f447f2d0 100644
--- 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
index ece2ecb08102..ca81d0d05c09 100644
--- 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);
 	}