---

yaml --- r: 233146 b: refs/heads/master c: 678ff89 h: refs/heads/master v: v3
git-mirror · Feb 12, 2011 · a809e54 · a809e54
1 parent a373838
commit a809e54
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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