From 30d93f0bb7c4ff5f7716d5d7d8cf4ee1d2cb860a Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hughd@google.com>
Date: Fri, 18 May 2012 11:28:34 -0700
Subject: [PATCH] --- yaml --- r: 300341 b: refs/heads/master c:
 62ade86ab6c7e26409229ca45503cae97bf698cf h: refs/heads/master i:   300339:
 6441a33b35a90f7f6028be079d9ba3344aa8dc00 v: v3

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

diff --git a/[refs] b/[refs]
index da9709cfa58f..0293e8bc020e 100644
--- 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
index b659260c56ad..7685d4a0b3ce 100644
--- 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;
 		}