---

yaml --- r: 320863 b: refs/heads/master c: 69980e3 h: refs/heads/master i: 320861: 989debc 320859: df02c3c 320855: 6039115 320847: 6b7c3da 320831: c7b10f0 v: v3
git-mirror · Aug 1, 2012 · 3595909 · 3595909
1 parent becca78
commit 3595909
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c1c9518331969f97ea403bac66f0fd4a85d204d5
+refs/heads/master: 69980e31754ef23307d51372e61bf7c2584f8a4b
diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
@@ -687,6 +687,7 @@ static unsigned long shrink_page_list(struct list_head *page_list,
 
 	cond_resched();
 
+	mem_cgroup_uncharge_start();
 	while (!list_empty(page_list)) {
 		enum page_references references;
 		struct address_space *mapping;
@@ -953,6 +954,7 @@ static unsigned long shrink_page_list(struct list_head *page_list,
 
 	list_splice(&ret_pages, page_list);
 	count_vm_events(PGACTIVATE, pgactivate);
+	mem_cgroup_uncharge_end();
 	*ret_nr_dirty += nr_dirty;
 	*ret_nr_writeback += nr_writeback;
 	return nr_reclaimed;