From 19df1499244b2ebd773cfb198c501ea766db4e22 Mon Sep 17 00:00:00 2001
From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Date: Tue, 1 Feb 2011 15:52:45 -0800
Subject: [PATCH] --- yaml --- r: 232735 b: refs/heads/master c:
 3751d60430fe4c26460a5ca8ad8672d32f93bcb1 h: refs/heads/master i:   232733:
 13bd9f23351a4f108697c7366a019beef0bd5e77   232731:
 4a77ccf23b184e18598cd126aaff5c3a92248a5b   232727:
 efb6813e470a5b6de2f04b2549c6f9d71b801d46   232719:
 ef56c153fb21e535f2646523a1525afff619b222   232703:
 6dae69561a64eb10ba3010f19cdff725e9f7a95e v: v3

---
 [refs]                | 2 +-
 trunk/mm/memcontrol.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 36f503277369..61fe8b3d221e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8493ae439f7038b502df1d687e61dde54c27ca92
+refs/heads/master: 3751d60430fe4c26460a5ca8ad8672d32f93bcb1
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
index fc75f34ba609..da53a252b259 100644
--- a/trunk/mm/memcontrol.c
+++ b/trunk/mm/memcontrol.c
@@ -612,8 +612,10 @@ static void mem_cgroup_charge_statistics(struct mem_cgroup *mem,
 	/* pagein of a big page is an event. So, ignore page size */
 	if (nr_pages > 0)
 		__this_cpu_inc(mem->stat->count[MEM_CGROUP_STAT_PGPGIN_COUNT]);
-	else
+	else {
 		__this_cpu_inc(mem->stat->count[MEM_CGROUP_STAT_PGPGOUT_COUNT]);
+		nr_pages = -nr_pages; /* for event */
+	}
 
 	__this_cpu_add(mem->stat->count[MEM_CGROUP_EVENTS], nr_pages);