From: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Date: Fri, 21 Sep 2012 01:00:27 +0000 (+1000)
Subject: thp: khugepaged_prealloc_page() forgot to reset the page alloc indicator
X-Git-Tag: next-20120925~1^2~209
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=468928f071442881cf811f320ad730c29e7311f7;p=karo-tx-linux.git

thp: khugepaged_prealloc_page() forgot to reset the page alloc indicator

If NUMA is enabled, the indicator is not reset if the previous page
request failed, ausing us to trigger the BUG_ON() in
khugepaged_alloc_page().

Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Michel Lespinasse <walken@google.com>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index b8d56e7d2945..14bbf6488a9d 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1798,6 +1798,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);