From: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Date: Thu, 13 Sep 2012 00:58:41 +0000 (+1000)
Subject: thp: remove khugepaged_loop
X-Git-Tag: next-20120919~1^2~190
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f9fc8b6ff9383ccfc7a0e7e4b4ad21faf82be3c6;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 7de778d97762..073d687c89de 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -2340,14 +2340,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;
@@ -2355,8 +2347,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;