From a809e541b5f236c5d1f3f07d9ac5766851b351f7 Mon Sep 17 00:00:00 2001
From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Date: Thu, 10 Feb 2011 15:01:36 -0800
Subject: [PATCH] --- yaml --- r: 233146 b: refs/heads/master c:
 678ff896a37afdbca292c7846ec895463aed35a5 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d80ce70552fc..8bc1054150be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0fdc5e8e6f579310458aef43d1610a0bb5e81a4
+refs/heads/master: 678ff896a37afdbca292c7846ec895463aed35a5
diff --git a/trunk/mm/huge_memory.c b/trunk/mm/huge_memory.c
index b6c1ce3c53b5..e62ddb8f24b6 100644
--- a/trunk/mm/huge_memory.c
+++ b/trunk/mm/huge_memory.c
@@ -1852,7 +1852,6 @@ static void collapse_huge_page(struct mm_struct *mm,
 		set_pmd_at(mm, address, pmd, _pmd);
 		spin_unlock(&mm->page_table_lock);
 		anon_vma_unlock(vma->anon_vma);
-		mem_cgroup_uncharge_page(new_page);
 		goto out;
 	}
 
@@ -1898,6 +1897,7 @@ static void collapse_huge_page(struct mm_struct *mm,
 	return;
 
 out:
+	mem_cgroup_uncharge_page(new_page);
 #ifdef CONFIG_NUMA
 	put_page(new_page);
 #endif