---

yaml --- r: 250906 b: refs/heads/master c: 700c2a4 h: refs/heads/master v: v3
git-mirror · May 25, 2011 · c0dd1cb · c0dd1cb
1 parent 7572ea2
commit c0dd1cb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22943ab116af1ead4dc112ec408a93cf1365b34a
+refs/heads/master: 700c2a46e88265326764197d5b8842490bae5569
diff --git a/trunk/mm/memory_hotplug.c b/trunk/mm/memory_hotplug.c
@@ -706,14 +706,15 @@ do_migrate_range(unsigned long start_pfn, unsigned long end_pfn)
 		if (!pfn_valid(pfn))
 			continue;
 		page = pfn_to_page(pfn);
-		if (!page_count(page))
+		if (!get_page_unless_zero(page))
 			continue;
 		/*
 		 * We can skip free pages. And we can only deal with pages on
 		 * LRU.
 		 */
 		ret = isolate_lru_page(page);
 		if (!ret) { /* Success */
+			put_page(page);
 			list_add_tail(&page->lru, &source);
 			move_pages--;
 			inc_zone_page_state(page, NR_ISOLATED_ANON +
@@ -725,6 +726,7 @@ do_migrate_range(unsigned long start_pfn, unsigned long end_pfn)
 			       pfn);
 			dump_page(page);
 #endif
+			put_page(page);
 			/* Because we don't have big zone->lock. we should
 			   check this again here. */
 			if (page_count(page)) {