---

yaml --- r: 332445 b: refs/heads/master c: e3b4126 h: refs/heads/master i: 332443: 3929fc1 v: v3
git-mirror · Oct 9, 2012 · 26cc758 · 26cc758
1 parent fa464a9
commit 26cc758
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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);