From: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Date: Wed, 26 Sep 2012 01:33:24 +0000 (+1000)
Subject: thp: remove khugepaged_loop
X-Git-Tag: next-20120927~1^2~310
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8c49870334f63335cc5466b9d87a64adf948d275;p=karo-tx-linux.git

thp: remove khugepaged_loop

Merge khugepaged_loop into khugepaged

Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Hugh Dickins <hughd@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 d70315b7e65a..612abe207823 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -2422,14 +2422,6 @@ 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;
@@ -2437,8 +2429,10 @@ static int khugepaged(void *none)
 	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;