---

yaml --- r: 284399 b: refs/heads/master c: 5013473 h: refs/heads/master i: 284397: 8589c8c 284395: 3e4b9e1 284391: 606cade 284383: 1b86b57 v: v3
git-mirror · Jan 13, 2012 · f1039c9 · f1039c9
1 parent d16ad66
commit f1039c9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b16d3d5a5219d01e9be5e586e5d50fbf1ca955ea
+refs/heads/master: 5013473152d1ac9d44d787fb02edda845fdf2cb3
diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
@@ -1196,13 +1196,17 @@ static unsigned long isolate_lru_pages(unsigned long nr_to_scan,
 				break;
 
 			if (__isolate_lru_page(cursor_page, mode, file) == 0) {
+				unsigned int isolated_pages;
+
 				mem_cgroup_lru_del(cursor_page);
 				list_move(&cursor_page->lru, dst);
-				nr_taken += hpage_nr_pages(cursor_page);
-				nr_lumpy_taken++;
+				isolated_pages = hpage_nr_pages(cursor_page);
+				nr_taken += isolated_pages;
+				nr_lumpy_taken += isolated_pages;
 				if (PageDirty(cursor_page))
-					nr_lumpy_dirty++;
+					nr_lumpy_dirty += isolated_pages;
 				scan++;
+				pfn += isolated_pages - 1;
 			} else {
 				/*
 				 * Check if the page is freed already.