From 26cc758320ed5de26edcd7b5e65bcba40c3872e2 Mon Sep 17 00:00:00 2001
From: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Date: Mon, 8 Oct 2012 16:32:57 -0700
Subject: [PATCH] --- yaml --- r: 332445 b: refs/heads/master c:
 e3b4126c556ca3a07699adf202d44bed3f453638 h: refs/heads/master i:   332443:
 3929fc1cc07fd6b4af63798ea52deaf4fbcbe9d2 v: v3

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

diff --git a/[refs] b/[refs]
index c7b7235f3085..0c02b7672066 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74c08f982674cfd5dfeb2702d631db9bcdabf788
+refs/heads/master: e3b4126c556ca3a07699adf202d44bed3f453638
diff --git a/trunk/mm/huge_memory.c b/trunk/mm/huge_memory.c
index 7cf8b0ec11ec..7153e0d18670 100644
--- a/trunk/mm/huge_memory.c
+++ b/trunk/mm/huge_memory.c
@@ -1797,6 +1797,7 @@ static bool khugepaged_prealloc_page(struct page **hpage, bool *wait)
 			return false;
 
 		*wait = false;
+		*hpage = NULL;
 		khugepaged_alloc_sleep();
 	} else if (*hpage) {
 		put_page(*hpage);