From 87058133e1374c9ac7e17b41ce80fb0a5b2a3fc6 Mon Sep 17 00:00:00 2001
From: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Date: Mon, 14 Dec 2009 17:58:11 -0800
Subject: [PATCH] --- yaml --- r: 176239 b: refs/heads/master c:
 6d9c285a632b39ab83c6ae14cbff0e606d4042ee h: refs/heads/master i:   176237:
 539511539726ad16d65da1aa5df256f59fd226a0   176235:
 86ea9a217618598743fbaba9032f9dd9798ef4d7   176231:
 38cb07bfb9cc44d046f5ba606196c8a6c2c08ccc   176223:
 7640d02b66be652f8a59e22bed0591f87033665d v: v3

---
 [refs]                    |  2 +-
 trunk/mm/memory_hotplug.c |  4 ++++
 trunk/mm/mempolicy.c      |  3 +++
 trunk/mm/migrate.c        | 12 ++++--------
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 2df1f2aaac3c..6dee988f1922 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee32398fda8ab9867cf8d5469d6e83de5f5c1f7c
+refs/heads/master: 6d9c285a632b39ab83c6ae14cbff0e606d4042ee
diff --git a/trunk/mm/memory_hotplug.c b/trunk/mm/memory_hotplug.c
index 2047465cd27c..e8116f8bdffa 100644
--- a/trunk/mm/memory_hotplug.c
+++ b/trunk/mm/memory_hotplug.c
@@ -27,6 +27,7 @@
 #include <linux/page-isolation.h>
 #include <linux/pfn.h>
 #include <linux/suspend.h>
+#include <linux/mm_inline.h>
 
 #include <asm/tlbflush.h>
 
@@ -672,6 +673,9 @@ do_migrate_range(unsigned long start_pfn, unsigned long end_pfn)
 		if (!ret) { /* Success */
 			list_add_tail(&page->lru, &source);
 			move_pages--;
+			inc_zone_page_state(page, NR_ISOLATED_ANON +
+					    page_is_file_cache(page));
+
 		} else {
 			/* Becasue we don't have big zone->lock. we should
 			   check this again here. */
diff --git a/trunk/mm/mempolicy.c b/trunk/mm/mempolicy.c
index 4545d5944243..0f89eabbaf3e 100644
--- a/trunk/mm/mempolicy.c
+++ b/trunk/mm/mempolicy.c
@@ -89,6 +89,7 @@
 #include <linux/security.h>
 #include <linux/syscalls.h>
 #include <linux/ctype.h>
+#include <linux/mm_inline.h>
 
 #include <asm/tlbflush.h>
 #include <asm/uaccess.h>
@@ -809,6 +810,8 @@ static void migrate_page_add(struct page *page, struct list_head *pagelist,
 	if ((flags & MPOL_MF_MOVE_ALL) || page_mapcount(page) == 1) {
 		if (!isolate_lru_page(page)) {
 			list_add_tail(&page->lru, pagelist);
+			inc_zone_page_state(page, NR_ISOLATED_ANON +
+					    page_is_file_cache(page));
 		}
 	}
 }
diff --git a/trunk/mm/migrate.c b/trunk/mm/migrate.c
index 0bc640fd68fa..576c25eeb1ca 100644
--- a/trunk/mm/migrate.c
+++ b/trunk/mm/migrate.c
@@ -746,13 +746,6 @@ int migrate_pages(struct list_head *from,
 	struct page *page2;
 	int swapwrite = current->flags & PF_SWAPWRITE;
 	int rc;
-	unsigned long flags;
-
-	local_irq_save(flags);
-	list_for_each_entry(page, from, lru)
-		__inc_zone_page_state(page, NR_ISOLATED_ANON +
-				page_is_file_cache(page));
-	local_irq_restore(flags);
 
 	if (!swapwrite)
 		current->flags |= PF_SWAPWRITE;
@@ -878,8 +871,11 @@ static int do_move_page_to_node_array(struct mm_struct *mm,
 			goto put_and_set;
 
 		err = isolate_lru_page(page);
-		if (!err)
+		if (!err) {
 			list_add_tail(&page->lru, &pagelist);
+			inc_zone_page_state(page, NR_ISOLATED_ANON +
+					    page_is_file_cache(page));
+		}
 put_and_set:
 		/*
 		 * Either remove the duplicate refcount from