From 2c21380e3222fa18127651af21ed6795f4839fc7 Mon Sep 17 00:00:00 2001
From: Bob Liu <lliubbo@gmail.com>
Date: Tue, 26 Oct 2010 14:22:10 -0700
Subject: [PATCH] --- yaml --- r: 217496 b: refs/heads/master c:
 809c444977adb7313e0612e9e3af4b73ba3f5746 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 616f3dd199b7..5984134de543 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6a3607e5f30dc642bead8cd95c48d47b6b4bfbb
+refs/heads/master: 809c444977adb7313e0612e9e3af4b73ba3f5746
diff --git a/trunk/mm/memory_hotplug.c b/trunk/mm/memory_hotplug.c
index bb63b36c4413..e4af144ee409 100644
--- a/trunk/mm/memory_hotplug.c
+++ b/trunk/mm/memory_hotplug.c
@@ -696,15 +696,17 @@ do_migrate_range(unsigned long start_pfn, unsigned long end_pfn)
 					    page_is_file_cache(page));
 
 		} else {
-			/* Becasue we don't have big zone->lock. we should
-			   check this again here. */
-			if (page_count(page))
-				not_managed++;
 #ifdef CONFIG_DEBUG_VM
 			printk(KERN_ALERT "removing pfn %lx from LRU failed\n",
 			       pfn);
 			dump_page(page);
 #endif
+			/* Becasue we don't have big zone->lock. we should
+			   check this again here. */
+			if (page_count(page)) {
+				not_managed++;
+				break;
+			}
 		}
 	}
 	ret = -EBUSY;