From 50222e5444e0e96f6ce824ca65c93ece97f669e6 Mon Sep 17 00:00:00 2001
From: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Date: Mon, 8 Oct 2012 16:29:46 -0700
Subject: [PATCH] --- yaml --- r: 332367 b: refs/heads/master c:
 9817626e722a5e5699cf38f5d3a4c9851e054436 h: refs/heads/master i:   332365:
 2bae67a22145e94056c46892115982f2b91684d8   332363:
 ff53c9853d7b3842cb2a1a0ba1409cdd2029e192   332359:
 3fcec9440cd14dc835ca20cf7edcfea6c0cf1256   332351:
 a62a70c215928c1d18141c9ba9e9f1bb725a01c1 v: v3

---
 [refs]                 |  2 +-
 trunk/mm/huge_memory.c | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 86715737d9f4..700bc3c2e3b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2017c0bff8ba79ea527361adbe19471e174775d6
+refs/heads/master: 9817626e722a5e5699cf38f5d3a4c9851e054436
diff --git a/trunk/mm/huge_memory.c b/trunk/mm/huge_memory.c
index a94c07a1b3c5..1e21b4cf4c75 100644
--- a/trunk/mm/huge_memory.c
+++ b/trunk/mm/huge_memory.c
@@ -2306,11 +2306,8 @@ static void khugepaged_wait_work(void)
 
 static void khugepaged_loop(void)
 {
-	struct page *hpage;
+	struct page *hpage = NULL;
 
-#ifdef CONFIG_NUMA
-	hpage = NULL;
-#endif
 	while (likely(khugepaged_enabled())) {
 #ifndef CONFIG_NUMA
 		hpage = khugepaged_alloc_hugepage();
@@ -2324,10 +2321,9 @@ static void khugepaged_loop(void)
 #endif
 
 		khugepaged_do_scan(&hpage);
-#ifndef CONFIG_NUMA
-		if (hpage)
+
+		if (!IS_ERR_OR_NULL(hpage))
 			put_page(hpage);
-#endif
 
 		khugepaged_wait_work();
 	}