thp: remove khugepaged_loop
Xiao Guangrong [Mon, 8 Oct 2012 23:29:54 +0000 (16:29 -0700)]
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>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

mm/huge_memory.c

index f0e9993..77b470b 100644 (file)
@@ -2339,14 +2339,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;
@@ -2354,8 +2346,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;