---

yaml --- r: 332367 b: refs/heads/master c: 9817626 h: refs/heads/master i: 332365: 2bae67a 332363: ff53c98 332359: 3fcec94 332351: a62a70c v: v3
git-mirror · Oct 9, 2012 · 50222e5 · 50222e5
1 parent 403edab
commit 50222e5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git 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
@@ -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();
 	}