---

yaml --- r: 332371 b: refs/heads/master c: b723178 h: refs/heads/master i: 332369: 3932df6 332367: 50222e5 v: v3
git-mirror · Oct 9, 2012 · 2b4226c · 2b4226c
1 parent d7163cf
commit 2b4226c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26234f36ef3ec7efcfa9acb181427849c1f9db7c
+refs/heads/master: b7231789b0224e73af4efc7973f8bcf17fc16edd
diff --git a/trunk/mm/huge_memory.c b/trunk/mm/huge_memory.c
@@ -2339,23 +2339,17 @@ static void khugepaged_wait_work(void)
 		wait_event_freezable(khugepaged_wait, khugepaged_wait_event());
 }
 
-static void khugepaged_loop(void)
-{
-	while (likely(khugepaged_enabled())) {
-		khugepaged_do_scan();
-		khugepaged_wait_work();
-	}
-}
-
 static int khugepaged(void *none)
 {
 	struct mm_slot *mm_slot;
 
 	set_freezable();
 	set_user_nice(current, 19);
 
-	while (!kthread_should_stop())
-		khugepaged_loop();
+	while (!kthread_should_stop()) {
+		khugepaged_do_scan();
+		khugepaged_wait_work();
+	}
 
 	spin_lock(&khugepaged_mm_lock);
 	mm_slot = khugepaged_scan.mm_slot;