---

yaml --- r: 300341 b: refs/heads/master c: 62ade86 h: refs/heads/master i: 300339: 6441a33 v: v3
git-mirror · May 19, 2012 · 30d93f0 · 30d93f0
1 parent 3262119
commit 30d93f0
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: b1dab2f0409c478fd2d9e227c2c018524eca9603
+refs/heads/master: 62ade86ab6c7e26409229ca45503cae97bf698cf
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
@@ -5481,7 +5481,7 @@ static int mem_cgroup_move_charge_pte_range(pmd_t *pmd,
 	 *    part of thp split is not executed yet.
 	 */
 	if (pmd_trans_huge_lock(pmd, vma) == 1) {
-		if (!mc.precharge) {
+		if (mc.precharge < HPAGE_PMD_NR) {
 			spin_unlock(&vma->vm_mm->page_table_lock);
 			return 0;
 		}