Merge khugepaged_loop into khugepaged
Signed-off-by: Xiao Guangrong <[email protected]>
---
mm/huge_memory.c | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 82f6cce..6ddf671 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -2354,14 +2354,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;
@@ -2369,8 +2361,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;
--
1.7.7.6
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
