From 359590956a9d8ae29ba95c39ef49a499c8b7e34c Mon Sep 17 00:00:00 2001
From: Tim Chen <tim.c.chen@linux.intel.com>
Date: Tue, 31 Jul 2012 16:46:08 -0700
Subject: [PATCH] --- yaml --- r: 320863 b: refs/heads/master c:
 69980e31754ef23307d51372e61bf7c2584f8a4b h: refs/heads/master i:   320861:
 989debc9bd5773eae1d0aa29e7da3a68d243ac1f   320859:
 df02c3ce05467058a4fdfec70dae4b5c80643b67   320855:
 6039115575c893f5308fc4383f1ba49e01eea3f3   320847:
 6b7c3da0a62c39389f2ecd239486c95c01566883   320831:
 c7b10f0a3ad275caeb5c325a04d6e1c50ecf58ab v: v3

---
 [refs]            | 2 +-
 trunk/mm/vmscan.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 85a25bbcb031..5f3f0a5a3633 100644
--- 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
index e37e68725090..8d01243d9560 100644
--- 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;